Add VPC: Don't list SG-enabled zones

Conflicts:
	ui/scripts/network.js
This commit is contained in:
Brian Federle 2012-12-04 10:46:25 -08:00
parent 1aecd7b42a
commit 2514b92e4b

View File

@ -4155,10 +4155,10 @@
url: createURL('listZones'), url: createURL('listZones'),
data: data, data: data,
success: function(json) { success: function(json) {
var zones = json.listzonesresponse.zone; var zones = json.listzonesresponse.zone;
var advZones = $.grep(zones, function(zone) { var advZones = $.grep(zones, function(zone) {
return zone.networktype == 'Advanced'; return zone.networktype == 'Advanced' && ! zone.securitygroupsenabled;
}); });
args.response.success({ args.response.success({
data: $.map(advZones, function(zone) { data: $.map(advZones, function(zone) {
return { return {