From 23c62e568bb9ca2201a9ebbb55ef1400d100867b Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 5 Oct 2010 14:55:36 -0700
Subject: [PATCH] new UI - show new password on middle menu if deploy virtual
 machine with a template whose password is enabled.

---
 ui/new/scripts/cloud.core2.instance.js | 17 ++++++++++++-----
 ui/new/scripts/cloud.core2.js          |  7 ++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 1051f059a26..3bde2701812 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -325,6 +325,7 @@ function clickInstanceGroupHeader($arrowIcon) {
                 else
                     commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&page="+currentPageInTemplateGridInVmPopup;  
 		    }
+    		commandString += "&hypervisor=XenServer"; //This line is temporary. will change it later.
     		
 		    var loading = $vmPopup.find("#wiz_template_loading").show();				
 		    if(currentPageInTemplateGridInVmPopup==1)
@@ -597,11 +598,17 @@ function clickInstanceGroupHeader($arrowIcon) {
 									    } else {
 										    $("body").stopTime(timerKey);										    
 										    if (result.jobstatus == 1) {
-											    // Succeeded												   
-											    afterAddingMidMenuItem($midmenuItem1, true);
-						                        if("virtualmachine" in result)	
-						                            vmToMidmenu(result.virtualmachine[0], $midmenuItem1);													   
-											    
+											    // Succeeded
+						                        //if("virtualmachine" in result) {	
+						                            vmToMidmenu(result.virtualmachine[0], $midmenuItem1);	
+						                            if (result.virtualmachine[0].passwordenabled == 'true') {												        
+												        var extraMessage = "New password:" + result.virtualmachine[0].password;
+												        afterAddingMidMenuItem($midmenuItem1, true, extraMessage);
+											        } 	
+											        else {
+											            afterAddingMidMenuItem($midmenuItem1, true);
+											        }	
+						                        //}	
 										    } else if (result.jobstatus == 2) {
 											    // Failed
 											    afterAddingMidMenuItem($midmenuItem1, false, fromdb(result.jobresult));		
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index 4bc87b26879..5ddd5e48ba7 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -619,10 +619,11 @@ function afterAddingMidMenuItem($midmenuItem1, isSuccessful, extraMessage) {
 	}
 	else {	
 	    $midmenuItem1.find("#info_icon").addClass("error").show();			
-	    $midmenuItem1.find("#first_row").text("Adding failed");	
-	    if(extraMessage != null)
-	        $midmenuItem1.find("#second_row").text(extraMessage);  
+	    $midmenuItem1.find("#first_row").text("Adding failed");		    
 	}
+	
+	if(extraMessage != null)
+	    $midmenuItem1.find("#second_row").text(extraMessage);  
 }
 
 function bindClickToMidMenu($midmenuItem1, toRightPanel, getMidmenuId) {