From 28f574d89094cb02883483a6c8eae2d8dc0889d2 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 17 Feb 2012 12:48:04 -0800
Subject: [PATCH] add zone wizard - preFilters - addPublicNetwork - consolidate
 conditinal statement  [reviewed-by: Brian]

---
 ui/scripts/zoneWizard.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 93408e1a2ef..00bead9dd8a 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -98,18 +98,9 @@
     },
 
     preFilters: {
-      addPublicNetwork: function(args) {
-				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();
-				}
-        
+      addPublicNetwork: function(args) {		
         var isShown;
+				var $publicTrafficDesc = $('.zone-wizard:visible').find('#add_zone_public_traffic_desc');	 
         if(args.data['network-model'] == 'Basic') {
           if(selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true) {
             $('.conditional.elb').show();
@@ -118,11 +109,17 @@
           else {
             $('.conditional.elb').hide();
             isShown = false;
-          }
+          }			
+					
+					$publicTrafficDesc.find('#for_basic_zone').css('display', 'inline');
+					$publicTrafficDesc.find('#for_advanced_zone').hide();					
         }
         else { //args.data['network-model'] == 'Advanced'
           $('.conditional.elb').hide();
-          isShown = true;
+          isShown = true;					
+					
+					$publicTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
+					$publicTrafficDesc.find('#for_basic_zone').hide();					
         }
         return isShown;
       },