[eGroupWare-svn] r46779 - /trunk/etemplate/js/et2_extension_nextmatch.js

[<nat...@us...>]

Author: nathangray
Date: Tue Apr 29 21:05:55 2014
New Revision: 46779

URL: http://svn.stylite.de/viewvc/egroupware?rev=46779&view=rev
Log:
Fix missing column filters after loading template(s)

Modified:
    trunk/etemplate/js/et2_extension_nextmatch.js

Modified: trunk/etemplate/js/et2_extension_nextmatch.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_extension_nextmatch.js?rev=46779&r1=46778&r2=46779&view=diff
==============================================================================
--- trunk/etemplate/js/et2_extension_nextmatch.js (original)
+++ trunk/etemplate/js/et2_extension_nextmatch.js Tue Apr 29 21:05:55 2014
@@ -993,16 +993,16 @@
 
 		// Create the grid controller
 		this.controller = new et2_nextmatch_controller(
-				null,
-				this.egw(),
-				this.getInstanceManager().etemplate_exec_id,
-				this,
-				null,
-				this.dataview.grid,
-				this.rowProvider,
-				this.options.settings.action_links,
-				null,
-				this.options.actions
+			null,
+			this.egw(),
+			this.getInstanceManager().etemplate_exec_id,
+			this,
+			null,
+			this.dataview.grid,
+			this.rowProvider,
+			this.options.settings.action_links,
+			null,
+			this.options.actions
 		);
 
 		// Need to trigger empty row the first time
@@ -1022,8 +1022,6 @@
 		/*this.controller.loadInitialOrder(this._getInitialOrder(
 			this.options.settings.rows, this.options.settings.row_id
 		));*/
-
-		this.controller.setFilters(this.activeFilters);
 
 		// Set the initial row count
 		var total = typeof this.options.settings.total != "undefined" ?
@@ -1449,10 +1447,14 @@
 			},1);
 
 			// Call the "setNextmatch" function of all registered
-			// INextmatchHeader widgets.
+			// INextmatchHeader widgets.  This updates this.activeFilters.col_filters according
+			// to what's in the template.
 			this.iterateOver(function (_node) {
 				_node.setNextmatch(this);
 			}, this, et2_INextmatchHeader);
+
+			// Set filters to current values
+			this.controller.setFilters(this.activeFilters);
 
 			// Load the default sort order
 			if (this.options.settings.order && this.options.settings.sort)
@@ -2258,7 +2260,7 @@
 			var value = {};
 			value[_widget.id] = _widget._oldValue = _widget.getValue();
 			var mgr = new et2_arrayMgr(value);
-			jQuery.extend(this.nextmatch.activeFilters,mgr.data);
+			jQuery.extend(true, this.nextmatch.activeFilters,mgr.data);
 		}, this, et2_inputWidget);
 	}
 });