From 0800b6423bccc2f633073b76867b110cbbaefe33 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Jul 2011 11:42:10 -0700
Subject: [PATCH] cloudStack - snapshot page - populate volume name first, then
 snapshot state.

---
 ui/scripts/cloud.core.instance.js | 25 ++++++++++++-------------
 ui/scripts/cloud.core.snapshot.js |  6 +++---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 44467e1ddcd..05b93cb01dd 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -149,8 +149,7 @@ function afterLoadInstanceJSP() {
 	if(isAdmin()) {		
 		$dialogStopVm.find("#force_stop_instance_container").show();		   
 	}
-	
-	
+		
     $.ajax({
 	    data: createURL("command=listOsTypes"),
 		dataType: "json",
@@ -228,7 +227,7 @@ function bindStopVMButton() {
             $("#dialog_info_please_select_one_item_in_middle_menu").dialog("open");		
             return false;
         }        
-        
+                   
         $("#dialog_confirmation_stop_vm")	
 	    .dialog('option', 'buttons', { 						
 		    "Confirm": function() { 
@@ -246,13 +245,13 @@ function bindStopVMButton() {
                             vmToRightPanel($midmenuItem1);                                             
                     }
                 }                      
-			    
+			     			    
 			    var isForced = $("#dialog_confirmation_stop_vm").find("#force_stop_instance").attr("checked").toString();
-			    
-                for(var id in selectedItemsInMidMenu) {	
-                    var apiCommand = "command=stopVirtualMachine&id="+id+"&forced="+isForced;                                    
-                    doActionToMidMenu(id, apiInfo, apiCommand); 	
-                }  			                  
+			    
+                for(var id in selectedItemsInMidMenu) {	
+                    var apiCommand = "command=stopVirtualMachine&id="+id+"&forced="+isForced;                                    
+                    doActionToMidMenu(id, apiInfo, apiCommand); 	
+                }  
                 
                 selectedItemsInMidMenu = {}; //clear selected items for action	                      					    
 		    }, 
@@ -1420,15 +1419,15 @@ function doStartVM($actionLink, $detailsTab, $midmenuItem1) {
 }   
 
 function doStopVM($actionLink, $detailsTab, $midmenuItem1) {   
-	$("#dialog_confirmation_stop_vm")
+    $("#dialog_confirmation_stop_vm")	  
     .dialog('option', 'buttons', { 						
 	    "Confirm": function() { 
 		    $(this).dialog("close"); 			
 		    
 		    var jsonObj = $midmenuItem1.data("jsonObj");
-		    var id = jsonObj.id;		    
-		    var isForced = $("#dialog_confirmation_stop_vm").find("#force_stop_instance").attr("checked").toString();
-		    var apiCommand = "command=stopVirtualMachine&id="+id+"&forced="+isForced;     		    
+		    var id = jsonObj.id;
+		    var isForced = $("#dialog_confirmation_stop_vm").find("#force_stop_instance").attr("checked").toString();
+		    var apiCommand = "command=stopVirtualMachine&id="+id+"&forced="+isForced;       
             doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);				   	                         					    
 	    }, 
 	    "Cancel": function() { 
diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js
index 84e9965ee1e..e63f6a67993 100644
--- a/ui/scripts/cloud.core.snapshot.js
+++ b/ui/scripts/cloud.core.snapshot.js
@@ -168,9 +168,9 @@ function snapshotJsonToDetailsTab() {
     });        
      
     $thisTab.find("#id").text(fromdb(jsonObj.id));
-    $thisTab.find("#name").text(fromdb(jsonObj.name));
-    $thisTab.find("#state").text(fromdb(jsonObj.state));    
-    $thisTab.find("#volume_name").text(fromdb(jsonObj.volumename));
+    $thisTab.find("#name").text(fromdb(jsonObj.name));     
+    $thisTab.find("#volume_name").text(fromdb(jsonObj.volumename));
+    $thisTab.find("#state").text(fromdb(jsonObj.state));   
     $thisTab.find("#interval_type").text(fromdb(jsonObj.intervaltype));
     $thisTab.find("#account").text(fromdb(jsonObj.account));
     $thisTab.find("#domain").text(fromdb(jsonObj.domain));