cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/4.1 to 35076ba
Date Wed, 19 Jun 2013 14:21:57 GMT
Updated Branches:
  refs/heads/4.1 daff3fe41 -> 35076ba1b


Shared networks is only supported in Basic zone and Advanced zone with SG in Infracstructure->Zone->Physical
Network->Guest->Network


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

Branch: refs/heads/4.1
Commit: 35076ba1b65aed2c76afc9373cb2e40d9c48d59d
Parents: daff3fe
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Wed Jun 19 16:21:49 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Wed Jun 19 16:21:49 2013 +0200

----------------------------------------------------------------------
 ui/scripts/system.js | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35076ba1/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index e51bf90..54a828f 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1120,6 +1120,13 @@
                         }
                       },
 
+                      preFilter: function(args) { //Shared networks is only supported in
Basic zone and Advanced zone with SG
+                          if(selectedZoneObj.networktype == "Advanced" && selectedZoneObj.securitygroupsenabled
!= true)
+                              return false;
+                          else
+                              return true;
+                      },
+
                       createForm: {
                         title: 'label.add.guest.network',  //Add guest network in advanced
zone
 


Mime
View raw message