From 964eeeb51545324e683a7059b4dccafb209e6faa Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 28 Mar 2012 14:24:18 -0700
Subject: [PATCH] bug 14514: cloudstack 3.0 UI - volume page - show download
 volume option when a volume's attached VM is stopped or when a volume is
 detached from a VM.

---
 .../WEB-INF/classes/resources/messages.properties   |  1 +
 ui/index.jsp                                        |  3 ++-
 ui/scripts/storage.js                               | 13 +++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index dfdf68adc44..4ae8529164d 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -3,6 +3,7 @@ label.management.ips=Management IP Addresses
 label.devices=Devices
 label.rules=Rules
 label.traffic.label=Traffic label
+label.vm.state=VM state
 #new labels (end) ************************************************************************************************
 
 
diff --git a/ui/index.jsp b/ui/index.jsp
index 8276f6e538d..a64facfc782 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -2915,6 +2915,7 @@ dictionary = {
 'message.action.delete.physical.network': '<fmt:message key="message.action.delete.physical.network" />',
 'label.physical.network': '<fmt:message key="label.physical.network" />',
 'label.devices': '<fmt:message key="label.devices" />',
-'label.rules': '<fmt:message key="label.rules" />'
+'label.rules': '<fmt:message key="label.rules" />',
+'label.vm.state': '<fmt:message key="label.vm.state" />'
 };
 </script>
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 7c34ed3988b..252edc197f2 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -834,12 +834,10 @@
                   },
                   {
                     id: { label: 'ID' },
-                    zonename: { label: 'label.zone' },
-                    deviceid: { label: 'label.device.id' },
+                    zonename: { label: 'label.zone' },                    
                     state: { label: 'label.state' },
                     type: { label: 'label.type' },
-                    storagetype: { label: 'label.storage.type' },
-                    storage: { label: 'label.storage' },
+                    storagetype: { label: 'label.storage.type' },                    
                     size : {
                       label: 'Size ',
                       converter: function(args) {
@@ -858,8 +856,11 @@
                           return args;
                       }
                     },
-                    vmname: { label: 'label.vm.name' },
+                    //vmname: { label: 'label.vm.name' },
                     vmdisplayname: { label: 'label.vm.display.name' },
+										vmstate: { label: 'label.vm.state' },
+										deviceid: { label: 'label.device.id' },
+										storage: { label: 'label.storage' },
                     created: { label: 'label.created', converter: cloudStack.converters.toLocalDate },
                     domain: { label: 'label.domain' },
                     account: { label: 'label.account' }
@@ -1174,7 +1175,7 @@
       allowedActions.push("recurringSnapshot");
     }
     if(jsonObj.state != "Allocated") {
-      if(jsonObj.vmstate == "Stopped") {
+      if(jsonObj.vmstate == "Stopped" || jsonObj.virtualmachineid == null) {
         allowedActions.push("downloadVolume");
       }
     }