apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://hugo@git-wip-us.apache.org/repos/asf/incubator-cloudstack.git

Browse Source
This commit is contained in:
Hugo Trippaers 2012-08-29 10:48:36 +02:00
commit f128d8e123
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/network.js
View File

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