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 <[email protected]> Authored: Mon Dec 17 11:03:49 2012 -0800 Committer: Jessica Wang <[email protected]> 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: [ {
