cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/master to d8f81fe
Date Tue, 04 Jun 2013 20:46:23 GMT
Updated Branches:
  refs/heads/master 95c9835f6 -> d8f81fe14


CLOUDSTACK-2205: Hide egress tab for shared networks


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

Branch: refs/heads/master
Commit: d8f81fe14d35ff272c465cfc821a48fde35dea6b
Parents: 95c9835
Author: Brian Federle <bfederle@gmail.com>
Authored: Tue Jun 4 13:46:09 2013 -0700
Committer: Brian Federle <bfederle@gmail.com>
Committed: Tue Jun 4 13:46:19 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8f81fe1/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index aa22290..e451de2 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -873,6 +873,7 @@
               var isVPC = false;
               var isAdvancedSGZone = false;
               var hiddenTabs = [];
+              var isSharedNetwork;
 
               // Get network offering data
               $.ajax({
@@ -886,6 +887,10 @@
                     isVPC = true;
                   }
 
+                  if (networkoffering.guestiptype == 'Shared') {
+                    isSharedNetwork = true;
+                  }
+
                   $(networkoffering.service).each(function(){
                     var thisService = this;
 
@@ -932,7 +937,7 @@
                 hiddenTabs.push("addloadBalancer");
               }
 
-              if (isVPC || isAdvancedSGZone ) {
+              if (isVPC || isAdvancedSGZone || isSharedNetwork) {
                  hiddenTabs.push('egressRules');
                }
               


Mime
View raw message