From c233a5c07ebdcd6ec034ee029cf5e6596db5ba34 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 9 Feb 2012 11:57:42 -0800
Subject: [PATCH] bug 13553: When clicking network on left menu - (1) make
 network section always available. (2) Check if there is SecurityGroup
 network, if yes, make SecurityGroup section available in filter dropdown.

---
 ui/scripts/network.js | 64 +++++++++----------------------------------
 1 file changed, 13 insertions(+), 51 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 5508f44397b..5c0866d853f 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -75,69 +75,31 @@
       return allowedActions;
     }
   };
-
-	var securityGroupNetworkObjs = [];
-	var isolatedSourcenatNetworkObjs = [];	
-	var sharedLbStaticnatSgNetworkObjs = [];
 	
   cloudStack.sections.network = {
     title: 'Network',
     id: 'network',
     sectionSelect: {
-      preFilter: function(args) {       
+      preFilter: function(args) {  
+			  var havingSecurityGroupNetwork = false;
         $.ajax({
-          url: createURL('listNetworks', { ignoreProject: true }),
-          data: {
-            supportedServices: 'SecurityGroup',
+          url: createURL('listNetworks'), 
+          data: {  
+            supportedServices: 'SecurityGroup',					
 						listAll: true
           },
           async: false,
-          success: function(data) {            
-            if (data.listnetworksresponse.network && data.listnetworksresponse.network.length) {
-              securityGroupNetworkObjs = data.listnetworksresponse.network;
+          success: function(data) {   
+            if (data.listnetworksresponse.network != null && data.listnetworksresponse.network.length > 0) {
+              havingSecurityGroupNetwork = true;
             }
           }
-        });
+        });	
 				
-				$.ajax({
-					url: createURL('listNetworks'),
-					data: {
-						type: 'isolated',
-						supportedServices: 'SourceNat',
-						listAll: true
-					},
-					async: false,
-					success: function(data) {					 
-						if (data.listnetworksresponse.network != null && data.listnetworksresponse.network.length > 0) {
-							isolatedSourcenatNetworkObjs = data.listnetworksresponse.network;
-						}
-					}
-				});
-				
-        $.ajax({
-					url: createURL('listNetworks'),
-					data: {
-						type: 'shared',
-						supportedServices: 'Lb,StaticNat,SecurityGroup',
-						listAll: true
-					},
-					async: false,
-					success: function(data) {					 
-						if (data.listnetworksresponse.network != null && data.listnetworksresponse.network.length > 0) {
-							sharedLbStaticnatSgNetworkObjs = data.listnetworksresponse.network;
-						}
-					}
-				});				
-						
-				var sectionsToShow = [];
-				if(securityGroupNetworkObjs.length > 0) //if there is securityGroup networks
-				  sectionsToShow.push('securityGroups'); //show securityGroup section
-					
-				if(isolatedSourcenatNetworkObjs.length > 0 || sharedLbStaticnatSgNetworkObjs.length > 0) //if there is isolatedSourceNat networks or sharedLbStaticnatSg networks
-				  sectionsToShow.push('networks');  //show network section
-					
-				if(sectionsToShow.length == 0) //if no securityGroup networks, nor isolatedSourceNat networks, nor sharedLbStaticnatSg networks
-				  sectionsToShow.push('networks'); // still show network section (no networks in the grid though)
+				var sectionsToShow = ['networks'];
+			  if(havingSecurityGroupNetwork == true) 
+				  sectionsToShow.push('securityGroups');
+							      
 				return sectionsToShow;					
       },