From be559498bc5cb4be62b12f029dc7c5578af3071a Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 5 Nov 2010 14:47:18 -0700
Subject: [PATCH] new UI - zone page - Add VLAN dialog box - if it's a
 dedicated zone (e.g. dedicated to domain AAA), only list domain AAA and
 children domain under domain AAA in domain dropdown field.

---
 ui/scripts/cloud.core.zone.js | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 22d6c2fee43..116b20a5627 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -317,19 +317,27 @@ function initAddVLANButton($addButton) {
 			});
 			
 			var domainSelect = dialogAddVlanForZone.find("#add_publicip_vlan_domain").empty();	
-			$.ajax({
-			    data: createURL("command=listDomains"+maxPageSize),
-				dataType: "json",
-				async: false,
-				success: function(json) {
-					var domains = json.listdomainsresponse.domain;						
-					if (domains != null && domains.length > 0) {
-						for (var i = 0; i < domains.length; i++) {
-							domainSelect.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>"); 
-						}
-					} 
-				}
-			});
+			domainSelect.append("<option value='" + zoneObj.domainid + "'>" + fromdb(zoneObj.domain) + "</option>"); 	
+									
+			function populateDomainDropdown(id) {					        
+                $.ajax({
+	                data: createURL("command=listDomainChildren&id="+id+"&pageSize=-1"),
+	                dataType: "json",
+	                async: false,
+	                success: function(json) {					        
+	                    var domains = json.listdomainchildrenresponse.domain;		                  		        	    
+		                if (domains != null && domains.length > 0) {					    
+			                for (var i = 0; i < domains.length; i++) {	
+				                domainSelect.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>"); 	
+				                if(domains[i].haschild == true) 
+		                            populateDomainDropdown(domains[i].id);				   
+			                }
+		                }				
+	                }
+                }); 
+            }	
+                           
+            populateDomainDropdown(zoneObj.domainid);
 		}
 
 		dialogAddVlanForZone