From 173d2ad3745f4180ef08dd9f41e4aae590d0860e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 21 May 2013 20:24:40 +0000
Subject: [PATCH] Fixes to actions, to better support changing after initial
 creation

---
 etemplate/js/et2_core_DOMWidget.js | 41 ++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/etemplate/js/et2_core_DOMWidget.js b/etemplate/js/et2_core_DOMWidget.js
index 0e53e89577..07913e0695 100644
--- a/etemplate/js/et2_core_DOMWidget.js
+++ b/etemplate/js/et2_core_DOMWidget.js
@@ -394,20 +394,42 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
 
 		// Initialize the action manager and add some actions to it
 		var gam = egw_getAppActionManager();
-		this._actionManager = gam.addAction("actionManager", this.id);
+		if(typeof this._actionManager != "object")
+		{
+			if(gam.getActionById(this.id) != null)
+			{
+				this._actionManager = gam.getActionById(this.id);
+			}
+			else
+			{
+				this._actionManager = gam.addAction("actionManager", this.id);
+			}
+		}
 		// ActionManager wants an array
 		var parsed_actions = [];
 		if(typeof actions == "object" && actions)
 		{
-			for(var key in actions)
+			var parse = function(actions)
 			{
-				actions[key].id = key;
-				if(typeof actions[key].icon != "undefined" && actions[key].icon)
+				var parsed = [];
+				for(var key in actions)
 				{
-					actions[key].iconUrl = this.egw().image(actions[key].icon);
+					actions[key].id = key;
+					if(typeof actions[key].icon != "undefined" && actions[key].icon)
+					{
+						actions[key].iconUrl = this.egw().image(actions[key].icon);
+					}
+					if(typeof actions[key].children != "undefined")
+					{
+						actions[key].children = parse(actions[key].children);
+					}
+					parsed.push(actions[key]);
 				}
-				parsed_actions.push(actions[key]);
-			}
+				return parsed;
+			};
+			// Don't make changes to original
+			var action = jQuery.extend(true, {}, actions);
+			parsed_actions = parse.call(this, action);
 		}
 		else
 		{
@@ -435,7 +457,10 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
 		if (widget_object == null) {
 			// Add a new container to the object manager which will hold the widget
 			// objects
-			widget_object = objectManager.addObject(this.id, new et2_action_object_impl(this));
+			widget_object = objectManager.insertObject(false, new egwActionObject(
+				this.id, objectManager, new et2_action_object_impl(this),
+				objectManager.manager.getActionById(this.id) || objectManager.manager
+			));
 		}
 
 		// Delete all old objects