You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/05/28 09:58:59 UTC
[14/50] git commit: updated refs/heads/master to b03e419
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/master
Commit: c89ca6a92f0eb9e30dbdaccca2b97ccad32f0a01
Parents: 9fff2c4
Author: Jessica Wang <je...@apache.org>
Authored: Tue May 21 13:15:09 2013 -0700
Committer: Jessica Wang <je...@apache.org>
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: {