From 539760ec685973c3da6bf1d7f0029900fcc02b0d Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 26 Oct 2012 10:42:19 -0700 Subject: [PATCH] CS-16612: cloudstack UI - Shared VLAN UI change - Network page - if it's Shared network and login is not root-admin, hide delete and restart option. --- ui/scripts/sharedFunctions.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 73e16a0b27a..5e187ed1b82 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -264,14 +264,18 @@ cloudStack.actionFilter = { guestNetwork: function(args) { var jsonObj = args.context.item; var allowedActions = []; - + if(jsonObj.type == 'Isolated') { allowedActions.push('edit'); //only Isolated network can be upgraded + allowedActions.push('restart'); + allowedActions.push('remove'); } - - allowedActions.push('restart'); - allowedActions.push('remove'); - + else if(jsonObj.type == 'Shared') { + if(isAdmin()) { + allowedActions.push('restart'); + allowedActions.push('remove'); + } + } return allowedActions; } }