From a85343f61f2e1697a6ed9cc9fc86fbcacb950b37 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 21 Dec 2010 13:58:15 -0800
Subject: [PATCH] bug 7592: Physical Resources - zone - network - Add Network
 dialog - remove pod dropdown field.

---
 ui/jsp/network.jsp               |  8 +-------
 ui/scripts/cloud.core.network.js | 21 ---------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 68a14ad7bb1..d5b8d1cf96d 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -938,13 +938,7 @@
                     <option value="account-specific">account-specific</option>
                     -->
                 </select>
-            </li>
-            <li style="display: none" id="add_publicip_vlan_pod_container">
-                <label for="user_name">
-                    Pod:</label>
-                <select class="select" name="add_publicip_vlan_pod" id="add_publicip_vlan_pod">
-                </select>
-            </li>
+            </li>           
             <li style="display: none" id="add_publicip_vlan_domain_container">
                 <label for="user_name">
                     Domain:</label>
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 4d02eb8f306..384ef859f71 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -1006,8 +1006,6 @@ function bindAddNetworkButton($button) {
      
     //***** binding Event Handler (begin) ******    
     $dialogAddNetworkForZone.find("#add_publicip_vlan_network_name_container, #add_publicip_vlan_network_desc_container").show();	
-			
-	$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").hide();		
 								
 	$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
 	 						
@@ -1048,25 +1046,6 @@ function bindAddNetworkButton($button) {
 			
 		} 
 		else {	
-			$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").show();				
-			
-			var podSelect = $dialogAddNetworkForZone.find("#add_publicip_vlan_pod").empty();		
-			$.ajax({
-			    data: createURL("command=listPods&zoneId="+zoneObj.id),
-				dataType: "json",
-				async: false,
-				success: function(json) {
-					var pods = json.listpodsresponse.pod;						
-					if (pods != null && pods.length > 0) {
-						for (var i = 0; i < pods.length; i++) {
-							podSelect.append("<option value='" + pods[i].id + "'>" + fromdb(pods[i].name) + "</option>"); 
-						}
-					} else {
-						podSelect.append("<option value=''>No available pods</option>"); 
-					}
-				}
-			});
-			
 			var domainSelect = $dialogAddNetworkForZone.find("#add_publicip_vlan_domain").empty();	
 			if(zoneObj.domainid != null) { //list only domains under zoneObj.domainid
 			    domainSelect.append("<option value='" + zoneObj.domainid + "'>" + fromdb(zoneObj.domain) + "</option>");