From 172ea6f1099a83f613c6f94c8f09a0081ebbc8eb Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 12 Apr 2012 16:21:03 -0700
Subject: [PATCH] cloudstack 3.0 UI - add zone wizard - step 2 - fix a bug that
 change event of network offerings dropdown was not triggered when visiting
 step 2 the first time.

---
 ui/scripts/zoneWizard.js | 52 +++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 2e4227b1298..3d31261b77c 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -347,7 +347,33 @@
           networkOfferingId: {
             label: 'label.network.offering',
 						dependsOn: 'hypervisor',
-            select: function(args, callbackFn) {	
+            select: function(args) {							  					
+							args.$select.unbind("change").bind("change", function(){									  
+								//reset when different network offering is selected
+								selectedNetworkOfferingHavingSG = false;
+								selectedNetworkOfferingHavingEIP = false;
+								selectedNetworkOfferingHavingELB = false;
+								selectedNetworkOfferingHavingNetscaler = false;
+								
+								var selectedNetworkOfferingId = $(this).val();  
+								$(networkOfferingObjs).each(function(){
+									if(this.id == selectedNetworkOfferingId) {
+										selectedNetworkOfferingObj = this;
+										return false; //break $.each() loop
+									}
+								});
+								
+								if(selectedNetworkOfferingObj.havingNetscaler == true)
+									selectedNetworkOfferingHavingNetscaler = true;
+								if(selectedNetworkOfferingObj.havingSG == true)
+									selectedNetworkOfferingHavingSG = true;
+								if(selectedNetworkOfferingObj.havingEIP == true)
+									selectedNetworkOfferingHavingEIP = true;
+								if(selectedNetworkOfferingObj.havingELB == true)
+									selectedNetworkOfferingHavingELB = true;	
+							});									
+							
+						
               $.ajax({
                 url: createURL("listNetworkOfferings&state=Enabled&guestiptype=Shared"),
                 dataType: "json",
@@ -407,30 +433,6 @@
                     })
                   });		
                   
-									args.$select.unbind("change").bind("change", function(){									  
-									  //reset when different network offering is selected
-										selectedNetworkOfferingHavingSG = false;
-										selectedNetworkOfferingHavingEIP = false;
-										selectedNetworkOfferingHavingELB = false;
-										selectedNetworkOfferingHavingNetscaler = false;
-										
-										var selectedNetworkOfferingId = $(this).val();                   
-										$(networkOfferingObjs).each(function(){
-											if(this.id == selectedNetworkOfferingId) {
-												selectedNetworkOfferingObj = this;
-												return false; //break $.each() loop
-											}
-										});
-                    
-										if(selectedNetworkOfferingObj.havingNetscaler == true)
-											selectedNetworkOfferingHavingNetscaler = true;
-										if(selectedNetworkOfferingObj.havingSG == true)
-											selectedNetworkOfferingHavingSG = true;
-										if(selectedNetworkOfferingObj.havingEIP == true)
-											selectedNetworkOfferingHavingEIP = true;
-										if(selectedNetworkOfferingObj.havingELB == true)
-											selectedNetworkOfferingHavingELB = true;										
-								  });									
                 }
               });										
             }