extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 17:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing column filters after loading template(s)

Browse Source
This commit is contained in:
Nathan Gray 2014-04-29 19:05:55 +00:00
parent 4d016169e7
commit d828eefaeb
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/js/et2_extension_nextmatch.js
View File

@ -1023,8 +1023,6 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
this.options.settings.rows, this.options.settings.row_id this.options.settings.rows, this.options.settings.row_id
));*/ ));*/
this.controller.setFilters(this.activeFilters);
// Set the initial row count // Set the initial row count
var total = typeof this.options.settings.total != "undefined" ? var total = typeof this.options.settings.total != "undefined" ?
this.options.settings.total : 0; this.options.settings.total : 0;
@ -1449,11 +1447,15 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
},1); },1);
// Call the "setNextmatch" function of all registered // 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) { this.iterateOver(function (_node) {
_node.setNextmatch(this); _node.setNextmatch(this);
}, this, et2_INextmatchHeader); }, this, et2_INextmatchHeader);
// Set filters to current values
this.controller.setFilters(this.activeFilters);
// Load the default sort order // Load the default sort order
if (this.options.settings.order && this.options.settings.sort) if (this.options.settings.order && this.options.settings.sort)
{ {
@ -2258,7 +2260,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
var value = {}; var value = {};
value[_widget.id] = _widget._oldValue = _widget.getValue(); value[_widget.id] = _widget._oldValue = _widget.getValue();
var mgr = new et2_arrayMgr(value); var mgr = new et2_arrayMgr(value);
jQuery.extend(this.nextmatch.activeFilters,mgr.data); jQuery.extend(true, this.nextmatch.activeFilters,mgr.data);
}, this, et2_inputWidget); }, this, et2_inputWidget);
} }
}); });