Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8878D1061E for ; Tue, 4 Jun 2013 20:46:23 +0000 (UTC) Received: (qmail 15836 invoked by uid 500); 4 Jun 2013 20:46:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 15786 invoked by uid 500); 4 Jun 2013 20:46:23 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 15779 invoked by uid 99); 4 Jun 2013 20:46:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 20:46:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 301AD54ECC; Tue, 4 Jun 2013 20:46:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Message-Id: <146bd9773f2c4599a5c60581386eb6d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to d8f81fe Date: Tue, 4 Jun 2013 20:46:23 +0000 (UTC) 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 Authored: Tue Jun 4 13:46:09 2013 -0700 Committer: Brian Federle 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'); }