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

CLOUDSTACK-4505: allow domain admin to expunge a destroyed VM

This commit is contained in:
Wei Zhou 2013-11-26 15:02:44 +01:00
parent 9be402cb06
commit 8b237eb0a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/tomcatconf/commands.properties.in
View File

@ -71,7 +71,7 @@ assignVirtualMachine=7
migrateVirtualMachine=1
migrateVirtualMachineWithVolume=1
recoverVirtualMachine=7
expungeVirtualMachine=1
expungeVirtualMachine=7
#### snapshot commands
createSnapshot=15

6
ui/scripts/instances.js
View File

@ -1765,7 +1765,7 @@
else if (isAdmin())
jsonObj = $.extend(args.context.instances[0], {
state: "Expunged"
}); //after root admin expunge a VM, listVirtualMachines API will no longer returns this expunged VM to all users.
}); //after root/domain admin expunge a VM, listVirtualMachines API will no longer returns this expunged VM to all users.
else
jsonObj = $.extend(args.context.instances[0], {
state: "Destroyed"
@ -2101,7 +2101,7 @@
if (isAdmin() || isDomainAdmin()) {
allowedActions.push("restore");
}
if (isAdmin())
if (isAdmin() || isDomainAdmin())
allowedActions.push("expunge");
} else if (jsonObj.state == 'Running') {
allowedActions.push("stop");
@ -2161,7 +2161,7 @@
} else if (jsonObj.state == 'Error') {
allowedActions.push("destroy");
} else if (jsonObj.state == 'Expunging') {
if (isAdmin())
if (isAdmin() || isDomainAdmin())
allowedActions.push("expunge");
}
return allowedActions;