From 23e5a01315aa911962826df59f9b3ad3daa4a22f Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 13 Jan 2011 11:49:25 -0800
Subject: [PATCH] account page - not update right panel after an action
 succeeds since the action might not belong to currently selected middle menu
 item.

---
 ui/scripts/cloud.core.account.js | 17 ++++++++++-------
 ui/scripts/cloud.core.js         |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 8244b3c4b2a..b8e7e50c4fe 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -537,7 +537,7 @@ var accountActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id) {             
             var item = json.queryasyncjobresultresponse.jobresult.account;
             accountToMidmenu(item, $midmenuItem1);           
-            accountJsonToDetailsTab();
+            //accountJsonToDetailsTab();
         }
     }    
     ,
@@ -549,7 +549,7 @@ var accountActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id) {  
             var item = json.queryasyncjobresultresponse.jobresult.account;
             accountToMidmenu(item, $midmenuItem1);           
-            accountJsonToDetailsTab();
+            //accountJsonToDetailsTab();
         }
     }    
     ,
@@ -560,7 +560,7 @@ var accountActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id) {   
             var item = json.enableaccountresponse.account;                  
             accountToMidmenu(item, $midmenuItem1);           
-            accountJsonToDetailsTab();
+            //accountJsonToDetailsTab();
         }
     } 
     ,
@@ -569,11 +569,14 @@ var accountActionMap = {
         asyncJobResponse: "deleteaccountresponse",
         dialogBeforeActionFn : doDeleteAccount,
         inProcessText: "Deleting account....",
-        afterActionSeccessFn: function(json, $midmenuItem1, id) {                   
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();
+        afterActionSeccessFn: function(json, $midmenuItem1, id) {    
+            $midmenuItem1.slideUp("slow", function() {                
+                $(this).remove();  
+                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                    clearRightPanel();
+                    accountClearRightPanel();
+                }                
             });
-            accountClearRightPanel();
         }
     }          
 }; 
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 83dc2e0ca11..e3197627eb9 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -124,9 +124,9 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
 	        dataType: "json",
 	        async: false,
 	        success: function(json) {	 	                  
-	            $spinningWheel.hide(); 	      
-	            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label + " action succeeded."));		            
-				afterActionSeccessFn(json, $midmenuItem1, id);				
+	            $spinningWheel.hide(); 	 
+	            afterActionSeccessFn(json, $midmenuItem1, id); //this line will update $midmenuItem1.data("jsonObj")	     
+	            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label + " action succeeded.")); //updated $midmenuItem1.data("jsonObj") will be used here	     
 	        },
             error: function(XMLHttpResponse) {
 				handleError(XMLHttpResponse, function() {