From d134a63ea8324a1295ff637fc5525812937c6e91 Mon Sep 17 00:00:00 2001
From: Pranav Saxena <pranav.saxena@citrix.com>
Date: Wed, 29 Aug 2012 13:28:00 +0530
Subject: [PATCH] CS-16147: Always show VPC section and VPN customer Gateway if
 advanced zone is present

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

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index ecc69d737c5..8d1eb2e0522 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -165,8 +165,9 @@
       preFilter: function(args) {
         var havingSecurityGroupNetwork = false;
         var havingBasicZones = false;
+        var havingAdvancedZones = true;
 
-        // Get basic zones
+        // Get zone types
         $.ajax({
           url: createURL('listZones'),
           async: false,
@@ -176,9 +177,14 @@
             var basicZones = $.grep(zones, function(zone) {
               return zone.networktype == 'Basic';
             });
+            var advancedZones = $.grep(zones, function(zone) {
+              return zone.networktype == 'Advanced';
+            });
+
             
             havingBasicZones = basicZones.length ? true : false;
-          }
+            havingAdvancedZones = advancedZones.length ? true : false;    
+      }
         });
         
         $.ajax({
@@ -197,7 +203,7 @@
 
         var sectionsToShow = ['networks'];
 
-        if (!havingBasicZones) {
+        if (havingAdvancedZones) {
           sectionsToShow.push('vpc');
           sectionsToShow.push('vpnCustomerGateway');
         }