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 2012/11/29 20:03:03 UTC
git commit: CLOUDSTACK-565: cloudstack UI - EIP/ELB Basic Zone -
Network menu > Guest Network Section > Network detailView > Add Load Balancer
tab > Add VMs button: pass current login's domainId and account to
listVirtualMachines API.
Updated Branches:
refs/heads/master 6d8cd9f5c -> fefec372a
CLOUDSTACK-565: cloudstack UI - EIP/ELB Basic Zone - Network menu > Guest Network Section > Network detailView > Add Load Balancer tab > Add VMs button: pass current login's domainId and account to listVirtualMachines API.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fefec372
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fefec372
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fefec372
Branch: refs/heads/master
Commit: fefec372a2da48f15151bf927f78894654775d51
Parents: 6d8cd9f
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Nov 29 11:02:34 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Thu Nov 29 11:02:34 2012 -0800
----------------------------------------------------------------------
ui/scripts/network.js | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fefec372/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 1336105..c53150d 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1190,7 +1190,7 @@
}
},
- addloadBalancer: {
+ addloadBalancer: { // EIP/ELB Basic zone: Add Load Balancer tab in network detailView
title: 'label.add.load.balancer',
custom: function(args) {
var context = args.context;
@@ -1201,21 +1201,18 @@
listView: $.extend(true, {}, cloudStack.sections.instances, {
listView: {
filters: false,
- dataProvider: function(args) {
- var networkid;
- if('vpc' in args.context)
- networkid = args.context.multiData.tier;
- else
- networkid = args.context.ipAddresses[0].associatednetworkid;
-
- var data = {
- page: args.page,
- pageSize: pageSize,
- networkid: networkid,
- listAll: true
- };
+
+ dataProvider: function(args) {
+ var data = {
+ page: args.page,
+ pageSize: pageSize,
+ domainid: g_domainid,
+ account: g_account,
+ networkid: args.context.networks[0].id,
+ listAll: true
+ };
- $.ajax({
+ $.ajax({
url: createURL('listVirtualMachines'),
data: data,
dataType: 'json',