Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 58CBBD59E for ; Mon, 17 Dec 2012 19:06:19 +0000 (UTC) Received: (qmail 83496 invoked by uid 500); 17 Dec 2012 19:06:19 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 83469 invoked by uid 500); 17 Dec 2012 19:06:19 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 83454 invoked by uid 99); 17 Dec 2012 19:06:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Dec 2012 19:06:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CF81581DE56; Mon, 17 Dec 2012 19:06:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: CLOUDSTACK-656: cloudstack UI - network menu - guest network section - detailView - should have only one preFilter(). Consolidate 2 preFilter() into 1. Message-Id: <20121217190618.CF81581DE56@tyr.zones.apache.org> Date: Mon, 17 Dec 2012 19:06:18 +0000 (UTC) Updated Branches: refs/heads/master 6ed198913 -> d6694abf4 CLOUDSTACK-656: cloudstack UI - network menu - guest network section - detailView - should have only one preFilter(). Consolidate 2 preFilter() into 1. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d6694abf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d6694abf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d6694abf Branch: refs/heads/master Commit: d6694abf4d7bc0999ae559a9a0c4d9985e9b17c4 Parents: 6ed1989 Author: Jessica Wang Authored: Mon Dec 17 11:03:49 2012 -0800 Committer: Jessica Wang Committed: Mon Dec 17 11:03:49 2012 -0800 ---------------------------------------------------------------------- ui/scripts/network.js | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d6694abf/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 23b1d30..0279523 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -912,19 +912,13 @@ hiddenFields.push("networkofferingid"); hiddenFields.push("networkdomain"); } + + if(!isAdmin()) { + hiddenFields.push("vlan"); + } + return hiddenFields; - }, - - preFilter: function(args) { - var hiddenFields; - if(isAdmin()) { - hiddenFields = []; - } - else { - hiddenFields = ["vlan"]; - } - return hiddenFields; - }, + }, fields: [ {