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

CLOUDSTACK-4966: UI > Instances > destroyed VM > implement "expunge" option (for root-admin and domain-admin only).

This commit is contained in:
Jessica Wang 2013-10-25 15:16:17 -07:00
parent a59f8096ba
commit 635ab5fbac
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ui/scripts/instances.js
View File

@ -593,6 +593,43 @@
poll: pollAsyncJobResult
}
},
expunge: {
label: 'Expunge Instance',
compactLabel: 'Expunge',
messages: {
confirm: function(args) {
return 'Please confirm you want to expunge this instance.';
},
notification: function(args) {
return 'Expunge Instance';
}
},
action: function(args) {
$.ajax({
url: createURL('destroyVirtualMachine'),
data: {
id: args.context.instances[0].id,
expunge: true
},
success: function(json) {
var jid = json.destroyvirtualmachineresponse.jobid;
args.response.success({
_custom: {
jobId: jid,
getActionFilter: function() {
return vmActionfilter;
}
}
});
}
});
},
notification: {
poll: pollAsyncJobResult
}
},
restore: {
label: 'label.action.restore.instance',
compactLabel: 'label.restore',
@ -2049,6 +2086,7 @@
if (jsonObj.state == 'Destroyed') {
if (isAdmin() || isDomainAdmin()) {
allowedActions.push("restore");
allowedActions.push("expunge");
}
} else if (jsonObj.state == 'Running') {
allowedActions.push("stop");