etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix destroy system VM action

This commit is contained in:
Brian Federle 2012-02-23 14:42:29 -08:00
parent e0072edf4b
commit 152e58c444
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/scripts/system.js
View File

@ -3446,7 +3446,8 @@
indicator: {
'Running': 'on',
'Stopped': 'off',
'Error': 'off'
'Error': 'off',
'Destroyed': 'off'
}
}
},
@ -3589,7 +3590,7 @@
}
},
'delete': {
destroy: {
label: 'label.action.destroy.systemvm',
messages: {
confirm: function(args) {
@ -3608,13 +3609,10 @@
var jid = json.destroysystemvmresponse.jobid;
args.response.success({
_custom: {
jobId: jid,
getUpdatedItem: function(json) {
//return {}; //nothing in this systemVM needs to be updated, in fact, this whole systemVM has being destroyed
getUpdatedItem: function() {
return { state: 'Destroyed' };
},
getActionFilter: function() {
return systemvmActionfilter;
}
jobId: jid
}
});
}
@ -7307,17 +7305,17 @@
if (jsonObj.state == 'Running') {
allowedActions.push("stop");
allowedActions.push("restart");
allowedActions.push("delete"); //destroy
allowedActions.push("destroy"); //destroy
allowedActions.push("viewConsole");
if (isAdmin())
allowedActions.push("migrate");
}
else if (jsonObj.state == 'Stopped') {
allowedActions.push("start");
allowedActions.push("delete"); //destroy
allowedActions.push("destroy"); //destroy
}
else if (jsonObj.state == 'Error') {
allowedActions.push("delete"); //destroy
allowedActions.push("destroy"); //destroy
}
return allowedActions;
}