extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix toolbar widget sometimes does not respect flat_list option

Browse Source
This commit is contained in:
Hadi Nategh 2016-05-30 17:12:55 +02:00
parent fc273beeb4
commit 736e18a553
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/et2_widget_toolbar.js
View File

@ -208,7 +208,7 @@ var et2_toolbar = (function(){ "use strict"; return et2_DOMWidget.extend([et2_II
}; };
for (var nAction in actions) for (var nAction in actions)
{ {
if (that.flat_list) if (that.options.flat_list)
{ {
totalCount += childCounter(actions[nAction],1); totalCount += childCounter(actions[nAction],1);
} }
@ -269,7 +269,7 @@ var et2_toolbar = (function(){ "use strict"; return et2_DOMWidget.extend([et2_II
} }
children[id] = info; children[id] = info;
if (that.flat_list) if (that.options.flat_list)
{ {
childaction = root.children[id]; childaction = root.children[id];
if (typeof pref === 'undefined' && !isDefault) if (typeof pref === 'undefined' && !isDefault)
@ -300,7 +300,7 @@ var et2_toolbar = (function(){ "use strict"; return et2_DOMWidget.extend([et2_II
} }
}; };
add_children(action, children); add_children(action, children);
if (this.flat_list && children) if (this.options.flat_list && children)
{ {
continue; continue;
} }