extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-21 20:50:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

backport r51645: Fixes for nextmatch changing row template

Browse Source 
- Remove & free children from previous template (fixes hundreds of hidden children)
- Init activeFilters.col_filter filters from settings, then use activeFilters instead of options.settings (fixes filters changed)
This commit is contained in:
Ralf Becker 2015-02-10 08:04:42 +00:00
parent a76946faa6
commit 27395c6adc
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
etemplate/js/et2_extension_nextmatch.js
View File

@ -157,6 +157,9 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
this._super.apply(this, arguments); this._super.apply(this, arguments);
this.activeFilters = {col_filter:{}}; this.activeFilters = {col_filter:{}};
// Directly set current col_filters from settings
jQuery.extend(this.activeFilters, this.options.settings.col_filter);
/* /*
Process selected custom fields here, so that the settings are correctly Process selected custom fields here, so that the settings are correctly
set before the row template is parsed set before the row template is parsed
@ -1510,6 +1513,18 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
this.rowProvider.free(); this.rowProvider.free();
this.controller.free(); this.controller.free();
// Free any children from previous template
// They may get left behind because of how detached nodes are processed
// We don't use iterateOver because it checks sub-children
for(var i = this._children.length-1; i >=0 ; i--)
{
var _node = this._children[i];
if(_node != this.header) {
this.removeChild(_node);
_node.destroy();
}
}
// Clear this setting if it's the same as the template, or // Clear this setting if it's the same as the template, or
// the columns will not be loaded // the columns will not be loaded
if(this.template == this.options.settings.columnselection_pref) if(this.template == this.options.settings.columnselection_pref)
@ -2960,9 +2975,9 @@ var et2_nextmatch_filterheader = et2_selectbox.extend([et2_INextmatchHeader, et2
this.nextmatch = _nextmatch; this.nextmatch = _nextmatch;
// Set current filter value from nextmatch settings // Set current filter value from nextmatch settings
if(this.nextmatch.options.settings.col_filter && typeof this.nextmatch.options.settings.col_filter[this.id] != "undefined") if(this.nextmatch.activeFilters.col_filter && typeof this.nextmatch.activeFilters.col_filter[this.id] != "undefined")
{ {
this.set_value(this.nextmatch.options.settings.col_filter[this.id]); this.set_value(this.nextmatch.activeFilters.col_filter[this.id]);
// Make sure it's set in the nextmatch // Make sure it's set in the nextmatch
_nextmatch.activeFilters.col_filter[this.id] = this.getValue(); _nextmatch.activeFilters.col_filter[this.id] = this.getValue();
@ -3024,9 +3039,9 @@ var et2_nextmatch_accountfilterheader = et2_selectAccount.extend([et2_INextmatch
this.nextmatch = _nextmatch; this.nextmatch = _nextmatch;
// Set current filter value from nextmatch settings // Set current filter value from nextmatch settings
if(this.nextmatch.options.settings.col_filter && this.nextmatch.options.settings.col_filter[this.id]) if(this.nextmatch.activeFilters.col_filter && this.nextmatch.activeFilters.col_filter[this.id])
{ {
this.set_value(this.nextmatch.options.settings.col_filter[this.id]); this.set_value(this.nextmatch.activeFilters.col_filter[this.id]);
} }
}, },
// Make sure selectbox is not longer than the column // Make sure selectbox is not longer than the column