extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 05:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix toolbar actions with no group were missing

Browse Source
This commit is contained in:
nathangray 2020-03-30 14:24:54 -06:00
parent 3750711cdf
commit b27387009d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,9 @@ var et2_toolbar = /** @class */ (function (_super) {
var action = actions[name_1]; var action = actions[name_1];
if (typeof action == 'string') if (typeof action == 'string')
action = { id: name_1, caption: action }; action = { id: name_1, caption: action };
if (typeof action.group == 'undefined') {
action.group = 'default';
}
// Add in divider // Add in divider
if (last_group_id != action.group) { if (last_group_id != action.group) {
last_group = jQuery('[data-group="' + action.group + '"]', this_1.actionlist); last_group = jQuery('[data-group="' + action.group + '"]', this_1.actionlist);

4
api/js/etemplate/et2_widget_toolbar.ts
View File

@ -276,6 +276,10 @@ class et2_toolbar extends et2_DOMWidget implements et2_IInput
{ {
let action = actions[name]; let action = actions[name];
if (typeof action == 'string') action = {id: name, caption: action}; if (typeof action == 'string') action = {id: name, caption: action};
if(typeof action.group == 'undefined')
{
action.group = 'default';
}
// Add in divider // Add in divider
if(last_group_id != action.group) if(last_group_id != action.group)