Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 219D7108CE for ; Wed, 10 Jul 2013 23:48:05 +0000 (UTC) Received: (qmail 22868 invoked by uid 500); 10 Jul 2013 23:48:04 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 22810 invoked by uid 500); 10 Jul 2013 23:48:04 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 22794 invoked by uid 99); 10 Jul 2013 23:48:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jul 2013 23:48:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7AC7988CB73; Wed, 10 Jul 2013 23:48:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Wed, 10 Jul 2013 23:48:04 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to 73cd064 Updated Branches: refs/heads/4.2 2ea61e7f2 -> 633335321 refs/heads/master 9de203483 -> 73cd064e5 CLOUDSTACK-2779: Fix ACL rule protocol number field -Fix protocol number field not passing start/end port -Fix protocol number for ACL rule 'edit' form Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/73cd064e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/73cd064e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/73cd064e Branch: refs/heads/master Commit: 73cd064e517bf3a3e3d1d8b34e4f1aaf6599adcc Parents: 9de2034 Author: Brian Federle Authored: Wed Jul 10 16:47:40 2013 -0700 Committer: Brian Federle Committed: Wed Jul 10 16:47:47 2013 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73cd064e/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 17ea65e..ab4d730 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -367,8 +367,12 @@ }); } else if (data.protocol === 'protocolnumber') { $.extend(data, { - protocolnumber: args.data.protocolnumber + protocol: args.data.protocolnumber, + startport: args.data.startport, + endport: args.data.endport }); + + delete args.data.protocolnumber; } $.ajax({ @@ -1149,10 +1153,17 @@ success:function(json){ var items = json.listnetworkaclsresponse.networkacl.sort(function(a, b) { return a.number >= b.number; + }).map(function(acl) { + if (parseInt(acl.protocol)) { // protocol number + acl.protocolnumber = acl.protocol; + acl.protocol = "protocolnumber"; + } + + return acl; }); args.response.success({ - data:items + data: items /* { cidrlist: '10.1.1.0/24', protocol: 'TCP',