Updated Branches: refs/heads/4.1 f8e3f161f -> 665822b1f
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/665822b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/665822b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/665822b1 Branch: refs/heads/4.1 Commit: 665822b1fe923ab6dafdeb964bc73c9f5a3d94e3 Parents: f8e3f16 Author: Jessica Wang <[email protected]> Authored: Thu Feb 28 11:02:52 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Thu Feb 28 11:04:22 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/665822b1/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 8b5171b..576ec62 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' @@ -1319,11 +1329,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));
