incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [4/5] git commit: Add VPC: Don't list SG-enabled zones
Date Wed, 05 Dec 2012 00:06:59 GMT
Add VPC: Don't list SG-enabled zones

Conflicts:
	ui/scripts/network.js


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2514b92e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2514b92e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2514b92e

Branch: refs/heads/master
Commit: 2514b92e4bd86b0dabfa2d5927699d0a5fdb0692
Parents: 1aecd7b
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Dec 4 10:46:25 2012 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Dec 4 10:49:38 2012 -0800

----------------------------------------------------------------------
 ui/scripts/network.js |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2514b92e/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 726790c..6bd38a3 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -4155,10 +4155,10 @@
                         url: createURL('listZones'),
                         data: data,
                         success: function(json) {
-                          var zones = json.listzonesresponse.zone;													
-													var advZones = $.grep(zones, function(zone) {													  
-													  return zone.networktype == 'Advanced';
-													});		
+                          var zones = json.listzonesresponse.zone;
+                          var advZones = $.grep(zones, function(zone) {
+                            return zone.networktype == 'Advanced' && ! zone.securitygroupsenabled;
+                          });
                           args.response.success({
                             data: $.map(advZones, function(zone) {
                               return {


Mime
View raw message