From 29147fa0b0e923ec4ee38348e27ff73ea4f21319 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 1 Mar 2011 16:10:01 -0800
Subject: [PATCH] bug 8757: Add Zone Wizard - Don't show VLAN range or guest
 CIDR if admin selects Advanced zone->security group.

---
 ui/scripts/cloud.core.resource.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 54d7ff4ae4c..0bb7d342867 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -1174,6 +1174,8 @@ function initAddZoneWizard() {
                 break;
             
             case "advanced_virtual":  
+                $thisWizard.find("#step2").find("#add_zone_vlan_container, #add_zone_guestcidraddress_container").show();
+            
                 //virtual VLAN: createVlanIpRange&forVirtualNetwork=true    //Advanced Zone - when securitygroup is NOT enabled                     
                 $thisWizard.find("#step4").find("#create_virtual_vlan").show();                 
 		        $addZoneWizard.find("#step4").find("#create_virtual_vlan").find("#add_publicip_vlan_scope").change(); 	
@@ -1183,6 +1185,8 @@ function initAddZoneWizard() {
                 break;
             
             case "advanced_securitygroup":
+                $thisWizard.find("#step2").find("#add_zone_vlan_container, #add_zone_guestcidraddress_container").hide();
+                
                 //direct VLAN: createVlanIpRange&forVirtualNetwork=false   //Advanced Zone - when securitygroup is enabled               
                 $thisWizard.find("#step4").find("#create_direct_vlan").show();  
                 $thisWizard.find("#step4").find("#create_direct_vlan").find("#vlan_id_container").show();