cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: refs/heads/4.1 - CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - guest network - network detail - View IP Ranges (only available in Advanced zone) - add IPv6 Start IP, IPv6 End IP field to listView and Add IP Range dialog.
Date Thu, 28 Feb 2013 00:36:45 GMT
Updated Branches:
  refs/heads/4.1 74ef84878 -> 3e0e92960


CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - guest network - network
detail - View IP Ranges (only available in Advanced zone) - add IPv6 Start IP, IPv6 End IP
field to listView and Add IP Range dialog.


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

Branch: refs/heads/4.1
Commit: 3e0e92960447c308b98dde75da5ee2d8bc50954b
Parents: 74ef848
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed Feb 27 16:33:58 2013 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Wed Feb 27 16:33:58 2013 -0800

----------------------------------------------------------------------
 ui/scripts/system.js |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3e0e9296/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 0277e73..207e9f2 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9690,8 +9690,10 @@
         listView: {
           section: 'guest-IP-range',
           fields: {
-            startip: { label: 'label.start.IP' },
-            endip: { label: 'label.end.IP' }
+            startip: { label: 'IPv4 Start IP' },
+            endip: { label: 'IPv4 End IP' },
+            startipv6: { label: 'IPv6 Start IP' },
+            endipv6: { label: 'IPv6 End IP' }
           },
 
           dataProvider: function(args) {
@@ -9712,16 +9714,24 @@
               createForm: {
                 title: 'label.add.ip.range',
                 fields: {
-                  guestStartIp: { label: 'label.guest.start.ip' },
-                  guestEndIp: { label: 'label.guest.end.ip' }
+                  startipv4: { label: 'IPv4 Start IP' },
+                  endipv4: { label: 'IPv4 End IP' },
+                  startipv6: { label: 'IPv6 Start IP' },
+                  endipv6: { label: 'IPv6 End IP' }
                 }
               },
               action: function(args) {
                 var array2 = [];
-                array2.push("&startip=" + args.data.guestStartIp);
-                var endip = args.data.guestEndIp;
-                if(endip != null && endip.length > 0)
-                  array2.push("&endip=" + endip);
+                if(args.data.startipv4 != null && args.data.startipv4.length >
0)
+                  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.startipv6 != null && args.data.startipv6.length >
0)
+                    array2.push("&startipv6=" + args.data.startipv6);               

+                  if(args.data.endipv6 != null && args.data.endipv6.length > 0)
+                    array2.push("&endipv6=" + args.data.endipv6);
+                
                 $.ajax({
                   url: createURL("createVlanIpRange&forVirtualNetwork=false&networkid="
+ args.context.networks[0].id + array2.join("")),
                   dataType: "json",


Mime
View raw message