From e22e5423427f0fe83b7f5da57286bfc040bd87e7 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Thu, 23 Aug 2012 11:27:20 -0700 Subject: [PATCH] CS-16147: Always show VPC section if advanced zone is present reviewed-by: jessica --- ui/scripts/network.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 6af5f0b7444..d681c114ac4 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -162,8 +162,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, @@ -173,8 +174,12 @@ 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; } }); @@ -194,7 +199,7 @@ var sectionsToShow = ['networks', 'vpnCustomerGateway']; - if (!havingBasicZones) { + if (havingAdvancedZones) { sectionsToShow.push('vpc'); }