From efc35809aed9bc667a7bba20205bf8dbfdbf9337 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 13 Jan 2011 11:01:16 -0800
Subject: [PATCH] Router page, SystemVM 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.js          | 6 +++---
 ui/scripts/cloud.core.router.js   | 6 +++---
 ui/scripts/cloud.core.systemvm.js | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 18f6a38acda..83dc2e0ca11 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -89,9 +89,9 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
 			                        $("body").stopTime(timerKey);				                        
 			                        $spinningWheel.hide(); 
 			                        			                          			                                             
-			                        if (result.jobstatus == 1) { // Succeeded 	
-			                            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label + " action succeeded."));			                            
-                                        afterActionSeccessFn(json, $midmenuItem1, id);     
+			                        if (result.jobstatus == 1) { // Succeeded 				                            	                            
+                                        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	 
 			                        } else if (result.jobstatus == 2) { // Failed	
 			                            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, false, (label + " action failed. Reason: " + fromdb(result.jobresult.errortext)));			                            
 			                        }											                    
diff --git a/ui/scripts/cloud.core.router.js b/ui/scripts/cloud.core.router.js
index 874b1ee39b2..6967828bedf 100644
--- a/ui/scripts/cloud.core.router.js
+++ b/ui/scripts/cloud.core.router.js
@@ -196,7 +196,7 @@ var routerActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id) {
             var item = json.queryasyncjobresultresponse.jobresult.domainrouter;    
             routerToMidmenu(item, $midmenuItem1);  
-            routerJsonToDetailsTab($midmenuItem1);   
+            //routerJsonToDetailsTab($midmenuItem1);   
         }
     },
     "Stop Router": {          
@@ -207,7 +207,7 @@ var routerActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id) {
             var item = json.queryasyncjobresultresponse.jobresult.domainrouter;    
             routerToMidmenu(item, $midmenuItem1);  
-            routerJsonToDetailsTab($midmenuItem1);   
+            //routerJsonToDetailsTab($midmenuItem1);   
         }
     },
     "Reboot Router": {           
@@ -218,7 +218,7 @@ var routerActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id) {
             var item = json.queryasyncjobresultresponse.jobresult.domainrouter;    
             routerToMidmenu(item, $midmenuItem1);  
-            routerJsonToDetailsTab($midmenuItem1);    
+            //routerJsonToDetailsTab($midmenuItem1);    
         }
     }
 }   
\ No newline at end of file
diff --git a/ui/scripts/cloud.core.systemvm.js b/ui/scripts/cloud.core.systemvm.js
index 555b006fbea..672ed143ecf 100644
--- a/ui/scripts/cloud.core.systemvm.js
+++ b/ui/scripts/cloud.core.systemvm.js
@@ -156,7 +156,7 @@ var systemVmActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id) {            
             var jsonObj = json.queryasyncjobresultresponse.jobresult.systemvm;  
             systemvmToMidmenu(jsonObj, $midmenuItem1);
-            systemvmToRightPanel($midmenuItem1);            
+            //systemvmToRightPanel($midmenuItem1);            
         }
     },
     "Stop System VM": {            
@@ -167,7 +167,7 @@ var systemVmActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id) {           
             var jsonObj = json.queryasyncjobresultresponse.jobresult.systemvm;                  	
             systemvmToMidmenu(jsonObj, $midmenuItem1);
-            systemvmToRightPanel($midmenuItem1);      
+            //systemvmToRightPanel($midmenuItem1);      
         }
     },
     "Reboot System VM": {        
@@ -178,7 +178,7 @@ var systemVmActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id) {            
             var jsonObj = json.queryasyncjobresultresponse.jobresult.systemvm;              
             systemvmToMidmenu(jsonObj, $midmenuItem1);
-            systemvmToRightPanel($midmenuItem1);      
+            //systemvmToRightPanel($midmenuItem1);      
         }
     }
 }