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/04/25 01:03:12 UTC
[04/42] git commit: updated refs/heads/ui-vm-affinity to 25f2f0f
CLOUDSTACK-2010: cloudstack UI - IPv6 - Infrastructure menu - zone detail - add IPv6 DNS1, IPv6 DNS 2 field.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b2b8f0e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b2b8f0e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b2b8f0e9
Branch: refs/heads/ui-vm-affinity
Commit: b2b8f0e9f48e529d936f9cd976d0fd5389f340f5
Parents: b9d8955
Author: Jessica Wang <je...@apache.org>
Authored: Mon Apr 22 15:07:31 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Apr 22 15:07:31 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b2b8f0e9/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a92506b..2058065 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -4893,14 +4893,16 @@
var array1 = [];
array1.push("&name=" +todb(args.data.name));
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) {
array1.push("&guestcidraddress=" + todb(args.data.guestcidraddress));
}
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("&localstorageenabled=" + (args.data.localstorageenabled == 'on'));
$.ajax({
@@ -4938,6 +4940,8 @@
allocationstate: { label: 'label.allocation.state' },
dns1: { label: 'label.dns.1', isEditable: true, validation: { required: 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 } },
internaldns2: { label: 'label.internal.dns.2', isEditable: true },
domainname: { label: 'label.domain' },
@@ -4950,8 +4954,8 @@
localstorageenabled: {
label: 'label.local.storage.enabled',
isBoolean: true,
- isEditable: true,
- converter:cloudStack.converters.toBooleanText
+ isEditable: true,
+ converter:cloudStack.converters.toBooleanText
}
}
],