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/02/28 21:47:53 UTC
[48/50] [abbrv] git commit: refs/heads/ui-multiple-nics -
CLOUDSTACK-452: cloudstack UI - Zone Wizard - add IPv6 DNS1 field,
IPv6 DNS2 field.
CLOUDSTACK-452: cloudstack UI - Zone Wizard - add IPv6 DNS1 field, IPv6 DNS2 field.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b1fcccc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b1fcccc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b1fcccc3
Branch: refs/heads/ui-multiple-nics
Commit: b1fcccc3f1a585482222f2c630d1c2fb9dde0622
Parents: ac89c3e
Author: Jessica Wang <je...@apache.org>
Authored: Thu Feb 28 11:02:52 2013 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Feb 28 12:07:33 2013 -0800
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1fcccc3/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 883553c..d8684fb 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -344,14 +344,24 @@
label: 'label.name', validation: { required: true },
desc: 'message.tooltip.zone.name'
},
- dns1: {
- label: 'label.dns.1', validation: { required: true },
+ ip4dns1: {
+ label: 'IPv4 DNS1', validation: { required: true },
desc: 'message.tooltip.dns.1'
},
- dns2: {
- label: 'label.dns.2',
+ ip4dns2: {
+ label: 'IPv4 DNS2',
desc: 'message.tooltip.dns.2'
},
+
+ ip6dns1: {
+ label: 'IPv6 DNS1',
+ desc: 'message.tooltip.dns.1'
+ },
+ ip6dns2: {
+ label: 'IPv6 DNS2',
+ desc: 'message.tooltip.dns.2'
+ },
+
internaldns1: {
label: 'label.internal.dns.1', validation: { required: true },
desc: 'message.tooltip.internal.dns.1'
@@ -1494,11 +1504,19 @@
if (args.data.zone.localstorageenabled == 'on') {
array1.push("&localstorageenabled=true");
}
- array1.push("&dns1=" + todb(args.data.zone.dns1));
-
- var dns2 = args.data.zone.dns2;
- if (dns2 != null && dns2.length > 0)
- array1.push("&dns2=" + todb(dns2));
+
+ //IPv4
+ if (args.data.zone.ip4dns1 != null && args.data.zone.ip4dns1.length > 0)
+ array1.push("&dns1=" + todb(args.data.zone.ip4dns1));
+ if (args.data.zone.ip4dns2 != null && args.data.zone.ip4dns2.length > 0)
+ array1.push("&dns2=" + todb(args.data.zone.ip4dns2));
+
+ //IPv6
+ if (args.data.zone.ip6dns1 != null && args.data.zone.ip6dns1.length > 0)
+ array1.push("&ip6dns1=" + todb(args.data.zone.ip6dns1));
+ if (args.data.zone.ip6dns2 != null && args.data.zone.ip6dns2.length > 0)
+ array1.push("&ip6dns2=" + todb(args.data.zone.ip6dns2));
+
array1.push("&internaldns1="+todb(args.data.zone.internaldns1));