From eaf4fc3d8b4bfb76e0664bbf8c62f99e1dc33fa8 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Mon, 6 Dec 2010 16:41:50 -0800
Subject: [PATCH] Fixed issues with vlan networks in a zone related to not
 making each network template unique.

---
 ui/scripts/cloud.core.zone.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 7c999102d3e..d0f6a2c9cb9 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -301,7 +301,8 @@ function zoneJsonClearNetworkTab() {
     $thisTab.find("#vlan_container").empty();    
 }	
 
-function vlanJsonToTemplate(jsonObj, $template1, isNetwork) {
+function vlanJsonToTemplate(jsonObj, $template1, isNetwork) {
+	$template1.attr("id", "network"+jsonObj.id);
     $template1.data("jsonObj", jsonObj);
     $template1.find("#vlan_id").text(jsonObj.vlan);
 	var ipRange = jsonObj.startip;
@@ -341,7 +342,7 @@ function vlanJsonToTemplate(jsonObj, $template1, isNetwork) {
 					var $container = $infoDropdown.find("#network_name_container").show();
 					$container.find("#network_name").text(fromdb(jsonObj.name));
 					$container = $infoDropdown.find("#network_desc_container").show();
-					$container.find("#network_desc").text(fromdb(jsonObj.diplaytext));
+					$container.find("#network_desc").text(fromdb(jsonObj.displaytext));
 				}
                 $infoDropdown.show();
                 break;
@@ -503,7 +504,7 @@ function initAddVLANButton($button, $leftmenuItem1) {
 							$template1.find("#vlan_type_icon").removeClass("direct").addClass("virtual");	
 							
 							var item = json.createvlaniprangeresponse.vlan;
-							vlanJsonToTemplate(item, $template1);	        				
+							vlanJsonToTemplate(item, $template1, false);	        				
 							$vlanContainer.prepend($template1);	
 							$template1.fadeIn("slow");
 						},
@@ -538,7 +539,7 @@ function initAddVLANButton($button, $leftmenuItem1) {
 												$template1.find("#vlan_type_icon").removeClass("virtual").addClass("direct");
 												
 												var item = json.createnetworkresponse.network;
-												vlanJsonToTemplate(item, $template1);	        				
+												vlanJsonToTemplate(item, $template1, true);	        				
 												$vlanContainer.prepend($template1);	
 												$template1.fadeIn("slow");
 											},