cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to ce9048c
Date Fri, 23 Aug 2013 00:39:27 GMT
Updated Branches:
  refs/heads/master 0934c6c2b -> ce9048c17


CLOUDSTACK-4413: UI > infrastructure > Guest IP Range > Add IP Range dialog >
add IPv6 CIDR field, IPv6 Gateway field.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce9048c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce9048c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce9048c1

Branch: refs/heads/master
Commit: ce9048c1729b7641b787f4fa80e028feac28311b
Parents: 0934c6c
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Aug 22 17:35:23 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Aug 22 17:39:15 2013 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce9048c1/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7dc9b94..33a3a46 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -15102,6 +15102,12 @@
                                     endipv4: {
                                         label: 'IPv4 End IP'
                                     },
+                                    ip6cidr: {
+                                    	label: 'IPv6 CIDR'
+                                    },
+                                    ip6gateway: {
+                                    	label: 'IPv6 Gateway'
+                                    },
                                     startipv6: {
                                         label: 'IPv6 Start IP'
                                     },
@@ -15122,7 +15128,12 @@
                                     array2.push("&startip=" + args.data.startipv4);
                                 if (args.data.endipv4 != null && args.data.endipv4.length
> 0)
                                     array2.push("&endip=" + args.data.endipv4);
-
+                                
+                                if (args.data.ip6cidr != null && args.data.ip6cidr.length
> 0)
+                                    array2.push("&ip6cidr=" + args.data.ip6cidr);
+                                if (args.data.ip6gateway != null && args.data.ip6gateway.length
> 0)
+                                    array2.push("&ip6gateway=" + args.data.ip6gateway);
+                                
                                 if (args.data.startipv6 != null && args.data.startipv6.length
> 0)
                                     array2.push("&startipv6=" + args.data.startipv6);
                                 if (args.data.endipv6 != null && args.data.endipv6.length
> 0)


Mime
View raw message