From 892a29c2ef89b92bd4a833bfaf83d922dd15e669 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 2 Apr 2012 17:03:28 -0700 Subject: [PATCH] bug 14585: cloudstack 3.0 UI - systemVM page - after destroy action completes, close detailView and remove it from listView. --- ui/scripts/system.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 88a4b79a4fb..3b09aeb8d7a 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -3685,7 +3685,7 @@ } }, - destroy: { + remove: { label: 'label.action.destroy.systemvm', messages: { confirm: function(args) { @@ -7434,17 +7434,17 @@ if (jsonObj.state == 'Running') { allowedActions.push("stop"); allowedActions.push("restart"); - allowedActions.push("destroy"); //destroy + allowedActions.push("remove"); allowedActions.push("viewConsole"); if (isAdmin()) allowedActions.push("migrate"); } else if (jsonObj.state == 'Stopped') { allowedActions.push("start"); - allowedActions.push("destroy"); //destroy + allowedActions.push("remove"); } else if (jsonObj.state == 'Error') { - allowedActions.push("destroy"); //destroy + allowedActions.push("remove"); } return allowedActions; }