From 856f41bdf875e1dfaba52f32e5bb4d8ca77654f2 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Thu, 23 Feb 2012 15:07:43 -0800
Subject: [PATCH] System, secondary storage UI fixes

-Add state field ('resourcestate') to list view

-Fix destroy action to have proper UI feedback
---
 .../classes/resources/messages.properties     |  3 +--
 ui/index.jsp                                  |  1 +
 ui/scripts/system.js                          | 21 ++++++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 2735ac080d3..4f84065c1c7 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,6 +1,5 @@
 #new labels (begin) **********************************************************************************************
-
-
+state.Enabled=Enabled
 #new labels (end) ************************************************************************************************
 
 
diff --git a/ui/index.jsp b/ui/index.jsp
index a5d937fb77b..8984a6b6116 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1617,6 +1617,7 @@
 
 <script language="javascript">
 dictionary = {
+'state.Enabled': '<fmt:message key="state.Enabled"/>',
 'label.system.wide.capacity': '<fmt:message key="label.system.wide.capacity"/>',
 'label.management': '<fmt:message key="label.management"/>',
 'label.guest': '<fmt:message key="label.guest"/>',
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 958aeda9134..987c4458771 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6321,7 +6321,18 @@
           section: 'seconary-storage',
           fields: {
             name: { label: 'label.name' },
-						created: { label: 'label.created', converter: cloudStack.converters.toLocalDate }
+						created: { label: 'label.created', converter: cloudStack.converters.toLocalDate },
+            resourcestate: {
+              label: 'label.state',
+              indicator: {
+                'Enabled': 'on',
+                'Disabled': 'off',
+                'Destroyed': 'off'
+              },
+              converter: function(str) {
+                return 'state.' + str;
+              }
+            }
           },
 
           dataProvider: function(args) {
@@ -6410,7 +6421,7 @@
           detailView: {
             name: 'Secondary storage details',
             actions: {
-              'delete': {
+              destroy: {
                 label: 'label.action.delete.secondary.storage' ,  
                 messages: {
                   confirm: function(args) {
@@ -6426,12 +6437,12 @@
                     dataType: "json",
                     async: true,
                     success: function(json) {
-                      args.response.success({data:{}});
+                      args.response.success();
                     }
                   });
                 },
                 notification: {
-                  poll: function(args) { args.complete(); }
+                  poll: function(args) { args.complete({ data: { resourcestate: 'Destroyed' } }); }
                 }
               }
 
@@ -7258,7 +7269,7 @@
   var secondarystorageActionfilter = function(args) {
     var jsonObj = args.context.item;
     var allowedActions = [];
-    allowedActions.push("delete");
+    allowedActions.push("destroy");
     return allowedActions;
   }