mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:19:00 +01:00
Improve handling of changing actions in a nextmatch response:
- Also (re)set default action on new actions - Avoid extra actionManagers
This commit is contained in:
parent
69fea7dc9c
commit
869bf62108
@ -1525,7 +1525,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
|
||||
{
|
||||
this.options.actions = actions;
|
||||
this.options.settings.action_links = this.controller._actionLinks = this._get_action_links(actions);
|
||||
this.controller._actionManager.updateActions(actions,this.controller.egw.appName);
|
||||
this.controller._initActions(actions);
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -188,7 +188,10 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider,
|
||||
// Initialize the action manager and add some actions to it
|
||||
// Only look 1 level deep
|
||||
var gam = egw_getActionManager(this.egw.appName,true,1);
|
||||
this._actionManager = gam.addAction("actionManager", uid);
|
||||
if(this._actionManager == null)
|
||||
{
|
||||
this._actionManager = gam.addAction("actionManager", uid);
|
||||
}
|
||||
this._actionManager.updateActions(_actions, this.egw.appName);
|
||||
var data = this._actionManager.data;
|
||||
if (data == 'undefined' || !data)
|
||||
|
Loading…
Reference in New Issue
Block a user