Updated Branches: refs/heads/master c8f744dbc -> 2d678063f
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/2d678063 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2d678063 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2d678063 Branch: refs/heads/master Commit: 2d678063fac318776f60b7f3b1d27323cac06dfc Parents: c8f744d Author: Wei Zhou <w.z...@leaseweb.com> Authored: Wed Jun 19 15:37:39 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Wed Jun 19 15:37:39 2013 +0200 ---------------------------------------------------------------------- ui/scripts/system.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d678063/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 452249a..7d0ea37 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1321,6 +1321,20 @@ } }, + preFilter: function(args) { //Isolated networks is only supported in Advanced (SG-disabled) zone + if(selectedZoneObj.networktype == "Advanced" && selectedZoneObj.securitygroupsenabled != true) + return false; + else + return true; + }, + + 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
