You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/05/24 00:06:38 UTC
[6/9] git commit: updated refs/heads/rbd-snap-clone to 7619076
CLOUDSTACK-2504: UI - create network offering dialog - pass specifyIpRanges=false for Isolated Network.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/026c2cec
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/026c2cec
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/026c2cec
Branch: refs/heads/rbd-snap-clone
Commit: 026c2cec6d3cb42c32929c9ed3ee417b7771b667
Parents: e8fbee0
Author: Jessica Wang <je...@apache.org>
Authored: Thu May 23 14:34:26 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Thu May 23 14:35:40 2013 -0700
----------------------------------------------------------------------
ui/scripts/configuration.js | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/026c2cec/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 808b342..9932cdc 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1919,26 +1919,22 @@
inputData['isPersistent'] = false;
}
else if (inputData['guestIpType'] == "Isolated") { //specifyVlan checkbox is shown
- if (inputData['specifyVlan'] == 'on') { //specifyVlan checkbox is checked
+ inputData['specifyIpRanges'] = false;
+
+ if (inputData['specifyVlan'] == 'on') { //specifyVlan checkbox is checked
inputData['specifyVlan'] = true;
- inputData['specifyIpRanges'] = true;
-
-
-
-
}
else { //specifyVlan checkbox is unchecked
inputData['specifyVlan'] = false;
- inputData['specifyIpRanges'] = false;
+
}
- if(inputData['isPersistent'] == 'on') { //It is a persistent network
- inputData['isPersistent'] = true;
- }
- else { //Isolated Network with Non-persistent network
- inputData['isPersistent'] = false;
- }
-
+ if(inputData['isPersistent'] == 'on') { //It is a persistent network
+ inputData['isPersistent'] = true;
+ }
+ else { //Isolated Network with Non-persistent network
+ inputData['isPersistent'] = false;
+ }
}