From 8819ec6ea7c7214ceb252db3657cfa288bbafaa8 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 30 Nov 2012 09:35:38 -0800 Subject: [PATCH] CLOUDSTACK-571: cloudstack UI - network menu - guest network section - network detailView - edit action - network offering upgrade is not allowed in Shared network. --- ui/scripts/network.js | 5 +++++ ui/scripts/sharedFunctions.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index c53150d5ac2..7d2345a1897 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -933,6 +933,11 @@ label: 'label.network.offering', isEditable: true, select: function(args){ + if (args.context.networks[0].type == 'Shared') { //Shared network is not allowed to upgrade to a different network offering + args.response.success({ data: [] }); + return; + } + if (args.context.networks[0].state == 'Destroyed') { args.response.success({ data: [] }); return; diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index b6b3ef817f6..f1b7efaa621 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -266,7 +266,7 @@ cloudStack.actionFilter = { var allowedActions = []; if(jsonObj.type == 'Isolated') { - allowedActions.push('edit'); //only Isolated network can be upgraded + allowedActions.push('edit'); //only Isolated network is allowed to upgrade to a different network offering (Shared network is not allowed to) allowedActions.push('restart'); allowedActions.push('remove'); }