VPC UI: Hide tier dropdown if viewing from tier detail view
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/94dba7d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/94dba7d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/94dba7d4 Branch: refs/heads/4.0 Commit: 94dba7d42b58ecd9881889dd12dff7e27f5c385e Parents: 6e73941 Author: Brian Federle <[email protected]> Authored: Wed Aug 15 10:13:49 2012 -0700 Committer: Alex Huang <[email protected]> Committed: Wed Aug 15 14:10:13 2012 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/94dba7d4/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index d36ae26..363bd33 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -17,6 +17,16 @@ (function($, cloudStack) { var aclMultiEdit = { noSelect: true, + fieldPreFilter: function(args) { + var context = args.context; + var hiddenFields = []; + + if (context.networks) { // from tier detail view + hiddenFields.push('networkid'); + } + + return hiddenFields; // Returns fields to be hidden + }, fields: { 'cidrlist': { edit: true, label: 'label.cidr' }, 'protocol': { @@ -130,7 +140,8 @@ $.ajax({ url: createURL('createNetworkACL'), data: $.extend(args.data, { - networkid: args.data.networkid + networkid: args.context.networks ? + args.context.networks[0].id : args.data.networkid }), dataType: 'json', success: function(data) {
