apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2010: cloudstack UI - IPv6 - Infrastructure menu - zone detail - add IPv6 DNS1, IPv6 DNS 2 field.

Browse Source
This commit is contained in:
Jessica Wang 2013-04-22 15:07:31 -07:00
parent b9d8955f4d
commit b2b8f0e9f4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/system.js
View File

@ -4893,14 +4893,16 @@
var array1 = []; var array1 = [];
array1.push("&name=" +todb(args.data.name)); array1.push("&name=" +todb(args.data.name));
array1.push("&dns1=" + todb(args.data.dns1)); array1.push("&dns1=" + todb(args.data.dns1));
array1.push("&dns2=" + todb(args.data.dns2)); //dns2 can be empty ("") when passed to API array1.push("&dns2=" + todb(args.data.dns2)); //dns2 can be empty ("") when passed to API, so a user gets to update this field from an existing value to blank.
array1.push("&ip6dns1=" + todb(args.data.ip6dns1)); //p6dns1 can be empty ("") when passed to API, so a user gets to update this field from an existing value to blank.
array1.push("&ip6dns2=" + todb(args.data.ip6dns2)); //ip6dns2 can be empty ("") when passed to API, so a user gets to update this field from an existing value to blank.
if (selectedZoneObj.networktype == "Advanced" && args.data.guestcidraddress) { if (selectedZoneObj.networktype == "Advanced" && args.data.guestcidraddress) {
array1.push("&guestcidraddress=" + todb(args.data.guestcidraddress)); array1.push("&guestcidraddress=" + todb(args.data.guestcidraddress));
} }
array1.push("&internaldns1=" + todb(args.data.internaldns1)); array1.push("&internaldns1=" + todb(args.data.internaldns1));
array1.push("&internaldns2=" + todb(args.data.internaldns2)); //internaldns2 can be empty ("") when passed to API array1.push("&internaldns2=" + todb(args.data.internaldns2)); //internaldns2 can be empty ("") when passed to API, so a user gets to update this field from an existing value to blank.
array1.push("&domain=" + todb(args.data.domain)); array1.push("&domain=" + todb(args.data.domain));
array1.push("&localstorageenabled=" + (args.data.localstorageenabled == 'on')); array1.push("&localstorageenabled=" + (args.data.localstorageenabled == 'on'));
$.ajax({ $.ajax({
@ -4938,6 +4940,8 @@
allocationstate: { label: 'label.allocation.state' }, allocationstate: { label: 'label.allocation.state' },
dns1: { label: 'label.dns.1', isEditable: true, validation: { required: true } }, dns1: { label: 'label.dns.1', isEditable: true, validation: { required: true } },
dns2: { label: 'label.dns.2', isEditable: true }, dns2: { label: 'label.dns.2', isEditable: true },
ip6dns1: { label: 'IPv6 DNS1', isEditable: true },
ip6dns2: { label: 'IPv6 DNS2', isEditable: true },
internaldns1: { label: 'label.internal.dns.1', isEditable: true, validation: { required: true } }, internaldns1: { label: 'label.internal.dns.1', isEditable: true, validation: { required: true } },
internaldns2: { label: 'label.internal.dns.2', isEditable: true }, internaldns2: { label: 'label.internal.dns.2', isEditable: true },
domainname: { label: 'label.domain' }, domainname: { label: 'label.domain' },
@ -4950,8 +4954,8 @@
localstorageenabled: { localstorageenabled: {
label: 'label.local.storage.enabled', label: 'label.local.storage.enabled',
isBoolean: true, isBoolean: true,
isEditable: true, isEditable: true,
converter:cloudStack.converters.toBooleanText converter:cloudStack.converters.toBooleanText
} }
} }
], ],