From 15be41048753e0d1020652a87750f8a371ed5921 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 1 Oct 2014 15:37:01 +0000
Subject: [PATCH] Make sure to use correct parent ObjectManager when
 destroying. Should fix "Action object with id ... does not exist" errors.

---
 etemplate/js/et2_core_DOMWidget.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/etemplate/js/et2_core_DOMWidget.js b/etemplate/js/et2_core_DOMWidget.js
index 498016cff3..362380f133 100644
--- a/etemplate/js/et2_core_DOMWidget.js
+++ b/etemplate/js/et2_core_DOMWidget.js
@@ -111,9 +111,10 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
 
 		if(this._actionManager)
 		{
-			if(egw_getAppObjectManager(false))
+			var app_om = egw_getObjectManager(this.egw().getAppName(), false,1);
+			if(app_om)
 			{
-				var om = egw_getAppObjectManager(false).getObjectById(this.id);
+				var om = app_om.getObjectById(this.id);
 				if(om) om.remove();
 			}
 			this._actionManager.remove();