diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index cb9dcf0b071..28490a91d77 100644 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -71,7 +71,7 @@ assignVirtualMachine=7 migrateVirtualMachine=1 migrateVirtualMachineWithVolume=1 recoverVirtualMachine=7 -expungeVirtualMachine=1 +expungeVirtualMachine=7 #### snapshot commands createSnapshot=15 diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 71c5a320bb8..06acc16583a 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -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;