From 046c556da11bdd88c5a8e59fc08433cb8132feaa Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 14 Jan 2011 11:01:06 -0800
Subject: [PATCH] instance page - reset password action - show new password in
 dialog and right panel when middle menu item is clicked.

---
 ui/scripts/cloud.core.instance.js | 13 +++----------
 ui/scripts/cloud.core.js          | 13 +++++++++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 44fbdb36b94..d73b0633862 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -1310,22 +1310,15 @@ var vmActionMap = {
             var jsonObj = json.queryasyncjobresultresponse.jobresult.virtualmachine;   
             vmToMidmenu(jsonObj, $midmenuItem1);      
             
-            var afterActionInfo = "New password of instance " + getVmName(jsonObj.name, jsonObj.displayname) + " is " + fromdb(jsonObj.password);
-            
             $("#dialog_info")
-            .text(afterActionInfo)    
+            .text("New password of instance " + getVmName(jsonObj.name, jsonObj.displayname) + " is " + fromdb(jsonObj.password))    
 	        .dialog('option', 'buttons', { 	
 		        "OK": function() { 
 			        $(this).dialog("close"); 
 		        } 
 	        }).dialog("open");	
-	         
-            /*         
-            var $afterActionInfoContainer = $("#right_panel_content #after_action_info_container_on_top");    
-	        $afterActionInfoContainer.find("#after_action_info").text(afterActionInfo);  
-            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, afterActionInfo); //override default afterActionInfo("Reset Password action succeeded")		    
-	        $afterActionInfoContainer.removeClass("errorbox").show();    
-		    */   
+	        
+	        return "New password is " + fromdb(jsonObj.password);
         }
     },       
     "Change Service": {
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index e3197627eb9..09a6ee78b50 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -90,8 +90,13 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
 			                        $spinningWheel.hide(); 
 			                        			                          			                                             
 			                        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	 
+                                        var afterActionInfo = afterActionSeccessFn(json, $midmenuItem1, id); //afterActionSeccessFn() will update $midmenuItem1.data("jsonObj")
+                                        
+                                        //handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
+                                        if(afterActionInfo == null)
+                                            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label + " action succeeded.")); 
+                                        else
+                                            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, afterActionInfo); 
 			                        } else if (result.jobstatus == 2) { // Failed	
 			                            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, false, (label + " action failed. Reason: " + fromdb(result.jobresult.errortext)));			                            
 			                        }											                    
@@ -125,8 +130,8 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
 	        async: false,
 	        success: function(json) {	 	                  
 	            $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	     
+	            afterActionSeccessFn(json, $midmenuItem1, id); //afterActionSeccessFn() will update $midmenuItem1.data("jsonObj")   
+	            handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label + " action succeeded.")); //handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
 	        },
             error: function(XMLHttpResponse) {
 				handleError(XMLHttpResponse, function() {