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 2013/07/15 20:19:34 UTC
[2/2] git commit: updated refs/heads/master to 841e761
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/841e7619
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/841e7619
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/841e7619
Branch: refs/heads/master
Commit: 841e761904f5e9e39bf46bab18cf6bedc9493d78
Parents: 17984a3
Author: Brian Federle <br...@citrix.com>
Authored: Mon Jul 15 11:19:03 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Jul 15 11:19:26 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/841e7619/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/841e7619/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index ab4d730..e90d8a7 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -3557,6 +3557,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'),