You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/08/01 09:31:28 UTC

git commit: updated refs/heads/4.1 to 697246d

Updated Branches:
  refs/heads/4.1 2e2dd684d -> 697246d7e


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

This reverts commit 35076ba1b65aed2c76afc9373cb2e40d9c48d59d.


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

Branch: refs/heads/4.1
Commit: 697246d7e1edacba3c341f691d525b9123a57811
Parents: 2e2dd68
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Aug 1 09:16:35 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Thu Aug 1 09:16:35 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/697246d7/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 54a828f..e51bf90 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1120,13 +1120,6 @@
                         }
                       },
 
-                      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