From 3f9b58bc73f01c49646e07f27ea0227b885a1008 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 21 Sep 2010 14:55:27 -0700
Subject: [PATCH] new UI - volume page - hide actions when volume state is
 "Creating" or "Corrupted" or volume is attaching to a VM.

---
 ui/new/scripts/cloud.core2.volume.js | 47 +++++++++++++---------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js
index ee9a5edda50..a7739cdbf18 100644
--- a/ui/new/scripts/cloud.core2.volume.js
+++ b/ui/new/scripts/cloud.core2.volume.js
@@ -70,33 +70,28 @@ function volumeJsonToDetailsTab(jsonObj){
     
     //buildActionLinkForDetailsTab("Take Snapshot", volumeActionMap, $actionMenu, volumeListAPIMap);	//show take snapshot
     //buildActionLinkForDetailsTab("Recurring Snapshot", volumeActionMap, $actionMenu, volumeListAPIMap);	//show Recurring Snapshot
-
-    if(jsonObj.type=="ROOT") {
-        if (jsonObj.vmstate == "Stopped")  
-            buildActionLinkForDetailsTab("Create Template", volumeActionMap, $actionMenu, volumeListAPIMap);	//show create template
-    } 
-    else { 
-	    if (jsonObj.virtualmachineid != null) {
-		    if (jsonObj.storagetype == "shared" && (jsonObj.vmstate == "Running" || jsonObj.vmstate == "Stopped")) {
-			    buildActionLinkForDetailsTab("Detach Disk", volumeActionMap, $actionMenu, volumeListAPIMap); //show detach disk
-		    }
-	    } else {
-		    // Disk not attached
-		    if (jsonObj.storagetype == "shared") {
-			    buildActionLinkForDetailsTab("Detach Disk", volumeActionMap, $actionMenu, volumeListAPIMap);   //show attach disk
-			    			  		    
-			    if(jsonObj.vmname == null || jsonObj.vmname == "none")
-			        buildActionLinkForDetailsTab("Delete Volume", volumeActionMap, $actionMenu, volumeListAPIMap); //show delete volume
-		    }
-	    }
+    
+    if(jsonObj.state != "Creating" && jsonObj.state != "Corrupted" && jsonObj.name != "attaching") {
+        if(jsonObj.type=="ROOT") {
+            if (jsonObj.vmstate == "Stopped")  
+                buildActionLinkForDetailsTab("Create Template", volumeActionMap, $actionMenu, volumeListAPIMap);	//show create template
+        } 
+        else { 
+	        if (jsonObj.virtualmachineid != null) {
+		        if (jsonObj.storagetype == "shared" && (jsonObj.vmstate == "Running" || jsonObj.vmstate == "Stopped")) {
+			        buildActionLinkForDetailsTab("Detach Disk", volumeActionMap, $actionMenu, volumeListAPIMap); //show detach disk
+		        }
+	        } else {
+		        // Disk not attached
+		        if (jsonObj.storagetype == "shared") {
+			        buildActionLinkForDetailsTab("Detach Disk", volumeActionMap, $actionMenu, volumeListAPIMap);   //show attach disk
+    			    			  		    
+			        if(jsonObj.vmname == null || jsonObj.vmname == "none")
+			            buildActionLinkForDetailsTab("Delete Volume", volumeActionMap, $actionMenu, volumeListAPIMap); //show delete volume
+		        }
+	        }
+        }
     }
-
-    /*
-    if(jsonObj.state == "Creating" || jsonObj.state == "Corrupted" || jsonObj.name == "attaching") 
-        template.find("#grid_links_container").hide(); //hide actions panel
-    else
-        template.find("#grid_links_container").show(); //show actions panel
-    */
 } 
  
 function volumeClearRightPanel() {