From fb6d06e3223a362cbb4bb9b9f5f79bd3ef30af43 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 13 Aug 2015 10:29:51 +0000
Subject: [PATCH] Mail folder management dialog: - Fix folder refresh on both
 index and folderMgmt trees

---
 mail/inc/class.mail_ui.inc.php |  5 +++--
 mail/js/app.js                 | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index fc7b4b8e21..40c3ffcbea 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -4641,13 +4641,14 @@ class mail_ui
 		{
 			$success = $this->ajax_deleteFolder($_folderName,true);
 			$response = egw_json_response::get();
+			list(,$folderName) = explode(self::$delimiter, $_folderName);
 			if ($success)
 			{
-				$res = $_folderName;
+				$res = $folderName;
 			}
 			else
 			{
-				$res = lang("Failed to delete %1",$_folderName);
+				$res = lang("Failed to delete %1",$folderName);
 			}
 			$response->data($res);
 		}
diff --git a/mail/js/app.js b/mail/js/app.js
index 806615e619..32287a5478 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4963,12 +4963,10 @@ app.classes.mail = AppJS.extend(
 	 * Detele button handler
 	 * triggers longTask dialog and send delete operation url
 	 * 
-	 * @param {egw object} _egw egw object
-	 * @param {widget object} _widget button widget
 	 */
-	folderMgmt_deleteBtn: function (_egw, _widget)
+	folderMgmt_deleteBtn: function ()
 	{
-		var tree = this.et2.getWidgetById('tree');
+		var tree = etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('tree');
 		var menuaction= 'mail.mail_ui.ajax_folderMgmt_delete';
 		
 		if (tree)
@@ -4983,14 +4981,16 @@ app.classes.mail = AppJS.extend(
 					if (_val && _resp.type !== 'error')
 					{
 						var stat = [];
-						var tree = etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('tree');
-						
-						// delete the item in folderMgmt dialog
-						if (tree) tree.deleteItem(_resp, false);
-						
-						stat[_resp] = _resp;
+						var folderName = '';
+						for(var i=0;i<selFldArr.length;i++)
+						{
+							folderName = selFldArr[i].split('::');
+							stat[selFldArr[i]] = folderName[1];
+						}
 						// delete the item from index folderTree
 						egw.window.app.mail.mail_removeLeaf(stat);
+						// submit
+						etemplate2.getByApplication('mail')[0].widgetContainer._inst.submit();
 					}
 				}, msg, 'Deleting folders', menuaction, selFldArr, 'mail');
 				return true;