From 6bbe637e84ef9ece59e072826995ae291bfbfcca Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 17 Feb 2012 11:42:17 -0800
Subject: [PATCH] bug 13628: add zone wizard - show different description of
 public traffic, guest traffic for basic zone and advanced zone.

---
 ui/scripts/zoneWizard.js | 47 ++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 3de8c16664e..b6217633209 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -10,24 +10,20 @@
       publicTrafficIPRange: function(args) {
         var multiEditData = [];
         var totalIndex = 0;
-
+								
+				var $publicTrafficDesc = $('.zone-wizard:visible').find('#add_zone_public_traffic_desc');	 
+				if (args.data['network-model'] == 'Basic') {
+					$publicTrafficDesc.find('#for_basic_zone').css('display', 'inline');
+					$publicTrafficDesc.find('#for_advanced_zone').hide();
+				}
+				else { //args.data['network-model'] == 'Advanced'
+					$publicTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
+					$publicTrafficDesc.find('#for_basic_zone').hide();
+				}		
+								
         return $('<div>').multiEdit({
           context: args.context,
-          noSelect: true,
-										
-					preFilter: function(args) {	//Brian, preFilter doesn't get picked up here			                 		
-						var $publicTrafficDesc = $("#add_zone_public_traffic_desc");	      
-						//debugger;					
-						if (args.data['network-model'] == 'Basic') {
-							$publicTrafficDesc.find("#for_basic_zone").css('display', 'inline');
-							$publicTrafficDesc.find("#for_advanced_zone").hide();
-						}
-						else { //args.data['network-model'] == 'Advanced'
-							$publicTrafficDesc.find("#for_advanced_zone").css('display', 'inline');
-							$publicTrafficDesc.find("#for_basic_zone").hide();
-						}		
-					},
-										
+          noSelect: true,															
           fields: {
             'gateway': { edit: true, label: 'label.gateway' },
             'netmask': { edit: true, label: 'label.netmask' },
@@ -382,16 +378,15 @@
 
       guestTraffic: {
         preFilter: function(args) {				                 		
-          var $guestTrafficDesc = $("#add_zone_guest_traffic_desc");	      
-          //debugger;				//Brian, please take a look here	
-          if (args.data['network-model'] == 'Basic') {
-            $guestTrafficDesc.find("#for_basic_zone").css('display', 'inline');
-						$guestTrafficDesc.find("#for_advanced_zone").hide();
-          }
-          else { //args.data['network-model'] == 'Advanced'
-            $guestTrafficDesc.find("#for_advanced_zone").css('display', 'inline');
-						$guestTrafficDesc.find("#for_basic_zone").hide();
-          }		
+          var $guestTrafficDesc = $('.zone-wizard:visible').find('#add_zone_guest_traffic_desc');	 		     
+					if (args.data['network-model'] == 'Basic') {
+						$guestTrafficDesc.find('#for_basic_zone').css('display', 'inline');
+						$guestTrafficDesc.find('#for_advanced_zone').hide();
+					}
+					else { //args.data['network-model'] == 'Advanced'
+						$guestTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
+						$guestTrafficDesc.find('#for_basic_zone').hide();
+					}		
 				
           var selectedZoneObj = {
             networktype: args.data['network-model']