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 0E5B391AD for ; Tue, 21 May 2013 20:16:23 +0000 (UTC) Received: (qmail 61030 invoked by uid 500); 21 May 2013 20:16:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 61018 invoked by uid 500); 21 May 2013 20:16:23 -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 61011 invoked by uid 99); 21 May 2013 20:16:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 May 2013 20:16:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E84138917AB; Tue, 21 May 2013 20:16:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: <6eb7392ef90343808b9809c2b80bd4b5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/ui-vpc-redesign to c89ca6a Date: Tue, 21 May 2013 20:16:22 +0000 (UTC) Updated Branches: refs/heads/ui-vpc-redesign 9fff2c4a6 -> c89ca6a92 CLOUDSTACK-747: internalLb in VPC - populate listView of internal LB. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c89ca6a9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c89ca6a9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c89ca6a9 Branch: refs/heads/ui-vpc-redesign Commit: c89ca6a92f0eb9e30dbdaccca2b97ccad32f0a01 Parents: 9fff2c4 Author: Jessica Wang Authored: Tue May 21 13:15:09 2013 -0700 Committer: Jessica Wang Committed: Tue May 21 13:15:09 2013 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c89ca6a9/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 9cef91a..d100aeb 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -335,17 +335,21 @@ listView: { id: 'internalLoadBalancers', fields: { - ipaddress: { label: 'label.ip.address' }, - type: { label: 'label.type' } + name: { label: 'label.name' }, + sourceipaddress: { label: 'Source IP Address' } }, - dataProvider: function(args) { - args.response.success({ - data: [ - { ipaddress: '10.3.2.1', type: 'Internal' }, - { ipaddress: '10.3.2.3', type: 'Internal' }, - { ipaddress: '10.232.1.4', type: 'Public' } - ] - }); + dataProvider: function(args) { + $.ajax({ + url: createURL('listLoadBalancers'), + data: { + networkid: args.context.networks[0].id + }, + success: function(json) { + var items = json.listloadbalancerssresponse.loadbalancer; + args.response.success({ data: items }); + + } + }); }, actions: { add: {