Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E074DC62 for ; Sat, 2 Mar 2013 01:01:41 +0000 (UTC) Received: (qmail 67702 invoked by uid 500); 2 Mar 2013 01:01:29 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 67620 invoked by uid 500); 2 Mar 2013 01:01:29 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 66504 invoked by uid 99); 2 Mar 2013 01:01:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Mar 2013 01:01:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7AA813BBE8; Sat, 2 Mar 2013 01:01:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [5/50] [abbrv] git commit: refs/heads/vim51_win8 - 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 an Message-Id: <20130302010128.7AA813BBE8@tyr.zones.apache.org> Date: Sat, 2 Mar 2013 01:01:28 +0000 (UTC) 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/ac89c3e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ac89c3e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ac89c3e7 Branch: refs/heads/vim51_win8 Commit: ac89c3e7e1ed3fbb5f207de8fdf1ebf6ba658836 Parents: 5dd44b0 Author: Jessica Wang Authored: Wed Feb 27 16:33:58 2013 -0800 Committer: Jessica Wang Committed: Thu Feb 28 12:05:56 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/ac89c3e7/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 7081d1b..2f105af 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -9946,8 +9946,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) { @@ -9968,16 +9970,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",