etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Jessica Wang 2012-11-29 11:02:34 -08:00
parent 6d8cd9f5c0
commit fefec372a2
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ui/scripts/network.js
View File

@ -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;
dataProvider: function(args) {
var data = {
page: args.page,
pageSize: pageSize,
domainid: g_domainid,
account: g_account,
networkid: args.context.networks[0].id,
listAll: true
};
var data = {
page: args.page,
pageSize: pageSize,
networkid: networkid,
listAll: true
};
$.ajax({
$.ajax({
url: createURL('listVirtualMachines'),
data: data,
dataType: 'json',