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

Remove all actions before setting to prevent conflicts between old and new actions with the same id

Browse Source 
Also update existing row actions (fixes issue with r52449)
This commit is contained in:
Nathan Gray 2015-04-13 17:20:47 +00:00
parent 7e7f22731a
commit cbcb273367
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/js/et2_extension_nextmatch.js
View File

@ -1688,6 +1688,10 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
set_actions: function(actions) {
if(actions != this.options.actions && this.controller != null && this.controller._actionManager)
{
for(var i = this.controller._actionManager.children.length - 1; i >= 0; i--)
{
this.controller._actionManager.children[i].remove();
}
this.options.actions = actions;
this.options.settings.action_links = this.controller._actionLinks = this._get_action_links(actions);

14
etemplate/js/et2_extension_nextmatch_controller.js
View File

@ -285,6 +285,20 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider,
| EGW_AO_FLAG_DEFAULT_FOCUS | EGW_AO_FLAG_IS_CONTAINER;
this._init_links_dnd(this._actionManager);
if(this._selectionMgr)
{
// Need to update the action links for every registered row too
for (var uid in this._selectionMgr._registeredRows)
{
// Get the corresponding entry from the registered rows array
var entry = this._selectionMgr._getRegisteredRowsEntry(uid);
if(entry.ao)
{
entry.ao.updateActionLinks(this._actionLinks);
}
}
}
},
/**