Merge branch 'advanced-search'
This commit is contained in:
		@@ -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)
 | 
			
		||||
 
 | 
			
		||||
@@ -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){
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user