From 3d8f17119e9971b0d0c617d4c19aaa5a3a5ec8cf Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Thu, 26 Jul 2012 15:21:52 -0700 Subject: [PATCH] Networks section: Only show VPC dropdown for Advanced zones --- ui/scripts/network.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index cb6342800ac..f82714ac6f1 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -160,6 +160,23 @@ sectionSelect: { preFilter: function(args) { var havingSecurityGroupNetwork = false; + var havingBasicZones = false; + + // Get basic zones + $.ajax({ + url: createURL('listZones'), + async: false, + success: function(json) { + var zones = json.listzonesresponse.zone ? + json.listzonesresponse.zone : []; + var basicZones = $.grep(zones, function(zone) { + return zone.networktype == 'Basic'; + }); + + havingBasicZones = basicZones.length ? true : false; + } + }); + $.ajax({ url: createURL('listNetworks', { ignoreProject: true }), data: { @@ -174,7 +191,12 @@ } }); - var sectionsToShow = ['networks', 'vpc', 'vpnCustomerGateway']; + var sectionsToShow = ['networks', 'vpnCustomerGateway']; + + if (!havingBasicZones) { + sectionsToShow.push('vpc'); + } + if(havingSecurityGroupNetwork == true) sectionsToShow.push('securityGroups');