Fix to JS in advanced search to set default condition on reset filters.

Fabrik · Jul 15, 2015 · b927cc3 · b927cc3
1 parent 176c5d2
commit b927cc3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/components/com_fabrik/models/list.php b/components/com_fabrik/models/list.php
@@ -6345,6 +6345,7 @@ public function getAdvancedSearchOpts()
 		}
 
 		$defaultStatement = $params->get('advanced-filter-default-statement', '<>');
+		$opts->defaultStatement = $defaultStatement;
 
 		$list = $this->getTable();
 		$listRef = $this->getRenderContext();

diff --git a/media/com_fabrik/js/advanced-search-min.js b/media/com_fabrik/js/advanced-search-min.js
diff --git a/media/com_fabrik/js/advanced-search.js b/media/com_fabrik/js/advanced-search.js
@@ -15,7 +15,8 @@ AdvancedSearch = new Class({
 	options: {
 		'ajax': false,
 		'controller': 'list',
-		'parentView': ''
+		'parentView': '',
+		'defaultStatement': '='
 	},
 
 	initialize: function (options) {
@@ -183,13 +184,20 @@ AdvancedSearch = new Class({
 			}
 			if (i === 0) {
 				tr.getElements('.inputbox').each(function (dd) {
-					dd.selectedIndex = 0;
-				});
+					if (dd.id.test(/condition$/))
+					{
+						dd.value = this.options.defaultStatement;
+					}
+					else
+					{
+						dd.selectedIndex = 0;
+					}
+				}.bind(this));
 				tr.getElements('input').each(function (i) {
 					i.value = '';
 				});
 			}
-		});
+		}.bind(this));
 		this.watchDelete();
 		this.watchElementList();
 		Fabrik.fireEvent('fabrik.advancedSearch.reset', this);