cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [36/50] [abbrv] git commit: updated refs/heads/internallb to ca2fc30
Date Wed, 24 Apr 2013 16:24:00 GMT
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/internallb
Commit: b2b8f0e9f48e529d936f9cd976d0fd5389f340f5
Parents: b9d8955
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Apr 22 15:07:31 2013 -0700
Committer: Jessica Wang <jessicawang@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
                         }
                       }
                     ],


Mime
View raw message