From 95a60dc8bc7dbda2c83d48cb47ed77a765b984f8 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Wed, 15 Aug 2012 10:13:49 -0700 Subject: [PATCH] VPC UI: Hide tier dropdown if viewing from tier detail view --- ui/scripts/vpc.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index d36ae264d2e..363bd33af84 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) {