From 9cbe30e22d0a215d5ccdd51db5d0010e9680c05a Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 20 Dec 2011 12:15:13 -0800
Subject: [PATCH] bug 12614: cloudStack 3.0 new UI - system - Add Zone Wizard -
 basic zone - when securityGroupsEnabled checkbox is checked, only display
 security-group-enabled network offerings. reviewed-by Brian.

---
 ui/scripts/system.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 78201e0da89..24e18c67355 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -2907,6 +2907,7 @@
                           }
                         });
 
+												var networkOfferingObjsWithSG = [];
 												var networkOfferingObjsWithoutSG = [];
                         $.ajax({
                           url: createURL("listNetworkOfferings&state=Enabled&guestiptype=Shared"),
@@ -2924,8 +2925,10 @@
 																	break;
 																}
 															}															
-															if(includingSGP == false) //withoutSG
-																networkOfferingObjsWithoutSG.push(this);																											
+															if(includingSGP == false) //without SG
+																networkOfferingObjsWithoutSG.push(this);
+                              else //with SG
+                                networkOfferingObjsWithSG.push(this);															
 														});														
                           }
                         });
@@ -2937,7 +2940,7 @@
                           networkOfferings: networkOfferingObjsWithoutSG,
 
                           // Security group-enabled offerings
-                          securityGroupNetworkOfferings: networkOfferingObjs
+                          securityGroupNetworkOfferings: networkOfferingObjsWithSG
                         });
                       },