Updated Branches: refs/heads/4.2 48e030589 -> e92e9884d refs/heads/master 17984a3f8 -> 841e76190
CLOUDSTACK-3002: Fix VLAN ID not being passed on create tier Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e92e9884 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e92e9884 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e92e9884 Branch: refs/heads/4.2 Commit: e92e9884d75176ce8d2da3761e93fde8028d21a3 Parents: 48e0305 Author: Brian Federle <[email protected]> Authored: Mon Jul 15 11:19:03 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Mon Jul 15 11:19:03 2013 -0700 ---------------------------------------------------------------------- ui/modules/vpc/vpc.js | 1 + ui/scripts/vpc.js | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e92e9884/ui/modules/vpc/vpc.js ---------------------------------------------------------------------- diff --git a/ui/modules/vpc/vpc.js b/ui/modules/vpc/vpc.js index fb7320d..9c0d39d 100644 --- a/ui/modules/vpc/vpc.js +++ b/ui/modules/vpc/vpc.js @@ -30,6 +30,7 @@ addAction.action({ context: context, data: args.data, + $form: args.$form, response: { success: function(args) { cloudStack.ui.notifications.add( http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e92e9884/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index d46b265..358237b 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -3551,6 +3551,9 @@ if(args.data.aclid !='') $.extend(dataObj, {aclid:args.data.aclid}); + if (args.$form.find('.form-item[rel=vlan]').is(':visible')) { + $.extend(dataObj, { vlan: args.data.vlan }); + } $.ajax({ url: createURL('createNetwork'),
