bug 14585: cloudstack 3.0 UI - systemVM page - after destroy action completes, close detailView and remove it from listView.

Jessica Wang · Jessica Wang · commit 892a29c2ef89 · 2012-04-02T17:03:57.000-07:00
diff --git 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;
   }

Original file line number	Diff line number	Diff line change
`@@ -3685,7 +3685,7 @@`
`3685`	`3685`	`}`
`3686`	`3686`	`},`
`3687`	`3687`
`3688`		`- destroy: {`
	`3688`	`+ remove: {`
`3689`	`3689`	`label: 'label.action.destroy.systemvm',`
`3690`	`3690`	`messages: {`
`3691`	`3691`	`confirm: function(args) {`
`@@ -7434,17 +7434,17 @@`
`7434`	`7434`	`if (jsonObj.state == 'Running') {`
`7435`	`7435`	`allowedActions.push("stop");`
`7436`	`7436`	`allowedActions.push("restart");`
`7437`		`- allowedActions.push("destroy"); //destroy`
	`7437`	`+ allowedActions.push("remove");`
`7438`	`7438`	`allowedActions.push("viewConsole");`
`7439`	`7439`	`if (isAdmin())`
`7440`	`7440`	`allowedActions.push("migrate");`
`7441`	`7441`	`}`
`7442`	`7442`	`else if (jsonObj.state == 'Stopped') {`
`7443`	`7443`	`allowedActions.push("start");`
`7444`		`- allowedActions.push("destroy"); //destroy`
	`7444`	`+ allowedActions.push("remove");`
`7445`	`7445`	`}`
`7446`	`7446`	`else if (jsonObj.state == 'Error') {`
`7447`		`- allowedActions.push("destroy"); //destroy`
	`7447`	`+ allowedActions.push("remove");`
`7448`	`7448`	`}`
`7449`	`7449`	`return allowedActions;`
`7450`	`7450`	`}`