You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/06/05 22:19:46 UTC
git commit: updated refs/heads/master to ee5f3d7
Updated Branches:
refs/heads/master 81d2a70bf -> ee5f3d726
CLOUDSTACK-747: UI - Internal LB detailView - change Assigned VMs tab to a listView.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ee5f3d72
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ee5f3d72
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ee5f3d72
Branch: refs/heads/master
Commit: ee5f3d7266f4f563f49db5bcf797927382016cae
Parents: 81d2a70
Author: Jessica Wang <je...@apache.org>
Authored: Wed Jun 5 13:17:18 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Jun 5 13:17:18 2013 -0700
----------------------------------------------------------------------
ui/scripts/vpc.js | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee5f3d72/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index a44f743..4cdc140 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -442,6 +442,7 @@
},
detailView: {
+ isMaximized: true,
name: 'Internal LB details',
actions: {
assignVm: {
@@ -605,24 +606,24 @@
assignedVms: {
title: 'Assigned VMs',
multiple: true,
- fields: [
- {
+ listView: {
+ fields: {
name: { label: 'label.name' },
ipaddress: { label: 'label.ip.address' }
- }
- ],
- dataProvider: function(args) {
- $.ajax({
- url: createURL('listLoadBalancers'),
- data: {
- id: args.context.internalLoadBalancers[0].id
- },
- success: function(json) {
- var item = json.listloadbalancerssresponse.loadbalancer[0];
- args.response.success({ data: item.loadbalancerinstance });
- }
- });
- }
+ },
+ dataProvider: function(args) {
+ $.ajax({
+ url: createURL('listLoadBalancers'),
+ data: {
+ id: args.context.internalLoadBalancers[0].id
+ },
+ success: function(json) {
+ var item = json.listloadbalancerssresponse.loadbalancer[0];
+ args.response.success({ data: item.loadbalancerinstance });
+ }
+ });
+ }
+ }
}
}
}