holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed setFilter to correctly return all current filter-values in its 1. parameter this.activeFilters

Browse Source
This commit is contained in:
Ralf Becker 2013-10-11 09:55:12 +00:00
parent 4354a02fbd
commit 3c80defe8b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etemplate/js/et2_extension_nextmatch.js
View File

@ -1821,7 +1821,8 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
if(typeof child.set_value != "undefined" && child.id) if(typeof child.set_value != "undefined" && child.id)
{ {
value = mgr.getEntry(child.id); value = mgr.getEntry(child.id);
child.set_value(value == null ? "" : value); if (value == null) value = '';
child.set_value(value);
} }
if(typeof child.get_value == "function" && child.id) if(typeof child.get_value == "function" && child.id)
{ {
@ -1832,17 +1833,19 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
// Split up indexes // Split up indexes
var indexes = child.id.replace('[','[').split('['); var indexes = child.id.replace('[','[').split('[');
if(indexes.length > 1) for(var i = 0; i < indexes.length; i++)
{ {
for(var i = 0; i < indexes.length; i++) { indexes[i] = indexes[i].replace('&#x5D;','').replace(']','');
indexes[i] = indexes[i].replace('&#x5D;','').replace(']',''); if (i < indexes.length-1)
if(typeof target[indexes[i]] == "undefined") { {
target[indexes[i]] = i == indexes.length-1 ? value : {}; if(typeof target[indexes[i]] == "undefined") target[indexes[i]] = {};
}
target = target[indexes[i]]; target = target[indexes[i]];
} }
else
{
target[indexes[i]] = value;
}
} }
target = value;
} }
}, filters); }, filters);