Merge branch 'advanced-search'

This commit is contained in:
Bachir Soussi Chiadmi
2018-01-02 12:13:16 +01:00
6 changed files with 28 additions and 8 deletions

View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
name = Materio Personal Notes
=======
name = Materio Personal Notes Module
>>>>>>> advanced-search
description = "Materio per user notes on node module"
; Core version (required)

View File

@@ -1183,10 +1183,18 @@ function materio_search_api_advanced_search_select_callback($form, &$form_state)
return $form['filters'];
}
function materio_search_api_advanced_search_addfilter_callback($form, &$form_state) {
return $form['filters'];
$commands = array();
$commands[] = ajax_command_replace('#advancedsearch-filters-wrapper', render($form['filters']));
$commands[] = array('command'=>'ajaxAfterAddedFilterLine');
return array("#type"=>'ajax', "#commands"=>$commands);
// return $form['filters'];
}
function materio_search_api_advanced_search_rmline_callback($form, &$form_state) {
return $form['filters'];
$commands = array();
$commands[] = ajax_command_replace('#advancedsearch-filters-wrapper', render($form['filters']));
$commands[] = array('command'=>'ajaxAfterRemovedFilterLine');
return array("#type"=>'ajax', "#commands"=>$commands);
// return $form['filters'];
}
function materio_search_api_advanced_search_form_validate($form, &$form_state){