From 740b4e7c4c8104f110ce6ac2fc4a58f1541f2665 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 18 Nov 2010 11:43:26 -0800
Subject: [PATCH] bug 6764: zone page - Add VLAN dialog - public untagged has
 only one option ("zone-wide") in scope.

---
 ui/jsp/zone.jsp               |  2 ++
 ui/scripts/cloud.core.zone.js | 59 ++++++++++++++++++-----------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp
index 031f667967b..5764c10fd70 100644
--- a/ui/jsp/zone.jsp
+++ b/ui/jsp/zone.jsp
@@ -378,8 +378,10 @@
                 <label for="add_publicip_vlan_scope">
                     Scope:</label>
                 <select class="select" name="add_publicip_vlan_scope" id="add_publicip_vlan_scope">
+                    <!--  
                     <option value="zone-wide">zone-wide</option>
                     <option value="account-specific">account-specific</option>
+                    -->
                 </select>
             </li>
             <li style="display: none" id="add_publicip_vlan_pod_container">
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index d6853c7a117..c6cb8b7e772 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -612,50 +612,50 @@ function bindEventHandlerToDialogAddVlanForZone() {
 			
 	dialogAddVlanForZone.find("#add_publicip_vlan_type").change(function(event) {
 	    var addPublicipVlanTagged = dialogAddVlanForZone.find("#add_publicip_vlan_tagged").empty();
-	   	
-		// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
-		dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 
-		
+	   		
 		if ($(this).val() == "false") { //direct VLAN (only tagged option)		
 			addPublicipVlanTagged.append('<option value="tagged">tagged</option>');
 							
 			dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();			
 			dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
 			
-		} else { //public VLAN	
-			addPublicipVlanTagged.append('<option value="untagged">untagged</option>').append('<option value="tagged">tagged</option>');	
-			
-			if (dialogAddVlanForZone.find("#add_publicip_vlan_tagged") == "tagged") {
-				dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
-				dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
-			} else {
-				dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").hide();
-				dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
-			}
 		} 
+		else if ($(this).val() == "true") { //public VLAN	
+			addPublicipVlanTagged.append('<option value="untagged">untagged</option>').append('<option value="tagged">tagged</option>');	
+		} 
+		
+		dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change();
+		
+		// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
+		dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 			
+		
 		return false;
 	});
 			
 	if (getNetworkType() != "vnet") {
-		dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change(function(event) {			
+		dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change(function(event) {	
+			if ($(this).val() == "tagged") {
+				dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
+				dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
+								
+				dialogAddVlanForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
+			} 
+			else if($(this).val() == "untagged") {  
+				dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").hide();
+				dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
+				
+				dialogAddVlanForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>');				
+			}			
+			
 			// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
 			dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 	
 			
-			if (dialogAddVlanForZone.find("#add_publicip_vlan_type").val() == "false") { //direct VLAN (only tagged option)						
-				dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();				
-				dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();	
-			} else { //public VLAN		
-				if ($(this).val() == "tagged") {
-					dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
-					dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
-				} else {
-					dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").hide();
-					dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
-				}
-			}
 			return false;
 		});
-	} else {
+		
+		dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change();		
+	} 
+	else {
 		dialogAddVlanForZone.find("#add_publicip_vlan_container").hide();
 	}
 	
@@ -663,7 +663,8 @@ function bindEventHandlerToDialogAddVlanForZone() {
 	    if($(this).val() == "zone-wide") {
 	        dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").hide();
 			dialogAddVlanForZone.find("#add_publicip_vlan_account_container").hide();    
-	    } else { // account-specific
+	    } 
+	    else if($(this).val() == "account-specific") { 
 	        dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").show();
 			dialogAddVlanForZone.find("#add_publicip_vlan_account_container").show();    
 	    }