From 89c22f647f641d6fbc4d4dac9e01bbe4981829e3 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 22 May 2012 15:35:28 -0700 Subject: [PATCH] CS-15042: cloudstack 3.0 UI - Create Network Offering dialog - when Guest Type is "Isolated", exclude "Security Groups" from services list. --- ui/scripts/configuration.js | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 1c156df5d66..92c0d49b8e2 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1084,33 +1084,12 @@ 'service.PortForwarding.isEnabled', 'service.Firewall.isEnabled', 'service.Vpn.isEnabled' - ]; - - //CS-14206 - /* - if (hasAdvancedZones) { //advanced zone - serviceFieldsToHide = [ - 'service.SourceNat.isEnabled', - 'service.StaticNat.isEnabled', - 'service.PortForwarding.isEnabled', - 'service.Lb.isEnabled', - 'service.Firewall.isEnabled', - 'service.Vpn.isEnabled' - ]; - } - else { //basic zone - serviceFieldsToHide = [ - 'service.SourceNat.isEnabled', - 'service.PortForwarding.isEnabled', - 'service.Firewall.isEnabled', - 'service.Vpn.isEnabled' - ]; - } - */ - + ]; } - else { //Isolated network offering (which supports all services) - serviceFieldsToHide = []; + else { //Isolated network offering + serviceFieldsToHide = [ + 'service.SecurityGroup.isEnabled' + ]; } //hide service fields that are included in serviceFieldsToHide