Repository: cloudstack
Updated Branches:
refs/heads/master c9dbfa063 -> c68325deb
CLOUDSTACK-6624: set specifyIpRanges to true if specifyVlan is set to true
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
(cherry picked from commit b7b9cd0d2d0dc9973e65c99ade3f550c6dd8dcd7)
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Conflicts:
ui/scripts/configuration.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c68325de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c68325de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c68325de
Branch: refs/heads/master
Commit: c68325deb189ebcd79f229d0db25d0cfe842f0dc
Parents: c9dbfa0
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Authored: Mon Sep 8 10:54:02 2014 +0200
Committer: Rohit Yadav <rohit.ya...@shapeblue.com>
Committed: Mon Sep 8 10:57:09 2014 +0200
----------------------------------------------------------------------
ui/scripts/configuration.js | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c68325de/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index e37ae4e..a70c672 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -3081,6 +3081,7 @@
if (inputData['specifyVlan'] == 'on') {
//specifyVlan checkbox is checked
inputData['specifyVlan'] = true;
+ inputData['specifyIpRanges'] = true;
} else { //specifyVlan checkbox is
unchecked
delete inputData.specifyVlan; //if
specifyVlan checkbox is unchecked, do not pass specifyVlan parameter to API
call since we need to keep API call's size as small as possible (p.s.
specifyVlan is defaulted as false at server-side)
}
