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

Fix toolbar default actions for flat_list toolbar

Browse Source
This commit is contained in:
Hadi Nategh 2014-02-20 18:04:04 +00:00
parent a70e12f3d3
commit 3105054be0
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etemplate/js/et2_widget_toolbar.js
View File

@ -110,7 +110,8 @@ var et2_toolbar = et2_DOMWidget.extend(
{ {
for (var name in actions) for (var name in actions)
{ {
if (!actions[name].toolbarDefault) if (!actions[name].toolbarDefault &&
(typeof actions[name].children === 'undefined' || !this.flat_list))
this.set_prefered(actions[name].id,'add'); this.set_prefered(actions[name].id,'add');
} }
} }
@ -135,7 +136,7 @@ var et2_toolbar = et2_DOMWidget.extend(
returnCounter = count; returnCounter = count;
} }
return returnCounter; return returnCounter;
} };
for (var nAction in actions) for (var nAction in actions)
{ {
if (that.flat_list) if (that.flat_list)
@ -148,7 +149,7 @@ var et2_toolbar = et2_DOMWidget.extend(
} }
} }
return totalCount; return totalCount;
} };
this.countActions = countActions(actions) - Object.keys(this.preference).length; this.countActions = countActions(actions) - Object.keys(this.preference).length;
@ -196,8 +197,15 @@ var et2_toolbar = et2_DOMWidget.extend(
if (that.flat_list) if (that.flat_list)
{ {
childaction = root.children[id]; childaction = root.children[id];
if (typeof root.children[id].group != 'undefined' && if (typeof pref === 'undefined')
typeof root.group != 'undefined') {
if (!childaction.toolbarDefault)
{
that.set_prefered(childaction.id,'add');
}
}
if (typeof root.children[id].group !== 'undefined' &&
typeof root.group !== 'undefined')
{ {
childaction.group = root.group; childaction.group = root.group;
} }
@ -359,7 +367,7 @@ var et2_toolbar = et2_DOMWidget.extend(
{ {
if ((this.countActions <= parseInt(this.view_range) || if ((this.countActions <= parseInt(this.view_range) ||
this.preference[action.id]) && this.preference[action.id]) &&
typeof button[0] != 'undefined') typeof button[0] !== 'undefined')
{ {
button[0].textContent = action.caption; button[0].textContent = action.caption;
} }