You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/08/15 19:14:28 UTC
git commit: VPC UI: Hide tier dropdown if viewing from tier detail
view
Updated Branches:
refs/heads/master 6a41965b7 -> 95a60dc8b
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/95a60dc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/95a60dc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/95a60dc8
Branch: refs/heads/master
Commit: 95a60dc8bc7dbda2c83d48cb47ed77a765b984f8
Parents: 6a41965
Author: Brian Federle <br...@citrix.com>
Authored: Wed Aug 15 10:13:49 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Aug 15 10:14:22 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/95a60dc8/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) {