From 8f6d836a813b1b453892cef82b90cf85b209957d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 22 May 2012 14:48:03 -0700
Subject: [PATCH] CS-14206: cloudstack 3.0 UI - Create Network Offering dialog
 - When Guest Type is "Shared", include LB and StaticNAT in services
 regardless of zone type.

---
 ui/scripts/configuration.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 932a172913c..1c156df5d66 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1079,6 +1079,15 @@
 										//hide/show service fields upon guestIpType(Shared/Isolated) and zoneType(Advanced/Basic) ***** (begin) *****						
 										var serviceFieldsToHide = [];										
 										if($guestTypeField.val() == 'Shared') { //Shared network offering
+										  serviceFieldsToHide = [
+												'service.SourceNat.isEnabled',													
+												'service.PortForwarding.isEnabled',													
+												'service.Firewall.isEnabled', 
+												'service.Vpn.isEnabled' 
+											];			
+										  
+											//CS-14206
+											/*
 										  if (hasAdvancedZones) { //advanced zone
 											  serviceFieldsToHide = [
 													'service.SourceNat.isEnabled',
@@ -1097,6 +1106,8 @@
 													'service.Vpn.isEnabled' 
 												];					
 											}
+											*/
+											
 										}
 										else { //Isolated network offering (which supports all services)
 										  serviceFieldsToHide = [];