From 4f6e48cff68c0967801849c315c2dbf0dac88b5e Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 18 Jan 2011 11:22:19 -0800 Subject: [PATCH] bug 8046: instance page - hide "restore VM" option from regular-user. --- ui/scripts/cloud.core.instance.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index e285ba35035..9ba6465a5a2 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -129,7 +129,10 @@ function afterLoadInstanceJSP() { initDialog("dialog_confirmation_stop_vm"); initDialog("dialog_confirmation_reboot_vm"); initDialog("dialog_confirmation_destroy_vm"); - initDialog("dialog_confirmation_restore_vm"); + + if(isAdmin() || isDomainAdmin()) + initDialog("dialog_confirmation_restore_vm"); + initDialog("dialog_confirmation_start_router"); initDialog("dialog_confirmation_stop_router"); initDialog("dialog_confirmation_reboot_router"); @@ -1707,9 +1710,8 @@ function vmJsonToDetailsTab(){ // Show State of the VM if (jsonObj.state == 'Destroyed') { - buildActionLinkForTab("Restore Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab); - //to hide view console in details tab....(to-do) - //to hide volume tab....(to-do) + if(isAdmin() || isDomainAdmin()) + buildActionLinkForTab("Restore Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab); } else if (jsonObj.state == 'Running') { //instanceTemplate.find("#vm_action_start, #vm_action_reset_password, #vm_action_change_service").removeClass().addClass("vmaction_links_off");