From 2608e30d39667e59d8d5b53efd97f76cfdad8a4d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 1 Mar 2012 16:41:04 -0800
Subject: [PATCH] delete volume action, delete snapshot action, delete router
 action - use 'remove' instead of 'destroy' since their definitions have been
 switched. [reviewed-by: Brian]

---
 ui/scripts/storage.js | 8 ++++----
 ui/scripts/system.js  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 602f0bee03a..42892100342 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -786,7 +786,7 @@
                 }
               },
 
-              'destroy': {
+              'remove': {
                 label: 'label.action.delete.volume',
                 messages: {
                   confirm: function(args) {
@@ -1089,7 +1089,7 @@
                 }
               },
 
-              'destroy': {
+              'remove': {
                 label: 'label.action.delete.snapshot',
                 messages: {
                   confirm: function(args) {
@@ -1195,7 +1195,7 @@
           }
         }
         else { // Disk not attached
-          allowedActions.push("destroy");
+          allowedActions.push("remove");
           allowedActions.push("migrateToAnotherStorage");
           if (jsonObj.storagetype == "shared") {
             allowedActions.push("attachDisk");
@@ -1218,7 +1218,7 @@
       allowedActions.push("createTemplate");
       allowedActions.push("createVolume");
     }
-    allowedActions.push("destroy");
+    allowedActions.push("remove");
     return allowedActions;
   }
 
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index bad11c2aa63..b1b3b9f9093 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -2006,7 +2006,7 @@
                         }
                       },      
 											
-											'destroy': {
+											'remove': {
 												label: 'label.destroy.router',
 												messages: {
 													confirm: function(args) {
@@ -7303,7 +7303,7 @@
     }
     else if (jsonObj.state == 'Stopped') {
       allowedActions.push("start");
-			allowedActions.push("destroy");
+	  allowedActions.push("remove");
       allowedActions.push("changeService");
     }
     return allowedActions;