From fac99b23dcf29f9666e16fc704ade968d8577189 Mon Sep 17 00:00:00 2001 From: bfederle Date: Mon, 30 Jan 2012 13:46:25 -0800 Subject: [PATCH] Network section: VM listing fix Fix admin not being able to assign VMs for port forward/LB to networks not assigned to them --- ui/scripts/network.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 3b521abf9d2..38e5a5ee68f 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -615,7 +615,8 @@ $.ajax({ url: createURL('listVirtualMachines'), data: { - networkid: args.context.networks[0].id + networkid: args.context.networks[0].id, + listAll: true }, dataType: 'json', async: true, @@ -1058,7 +1059,8 @@ $.ajax({ url: createURL('listVirtualMachines'), data: { - networkid: args.context.networks[0].id + networkid: args.context.networks[0].id, + listAll: true }, dataType: 'json', async: true, @@ -1483,7 +1485,8 @@ $.ajax({ url: createURL('listVirtualMachines'), data: { - id: args.context.ipAddresses[0].virtualmachineid + id: args.context.ipAddresses[0].virtualmachineid, + listAll: true }, dataType: 'json', async: true, @@ -1610,7 +1613,8 @@ $.ajax({ url: createURL('listVirtualMachines'), data: { - networkid: args.context.ipAddresses[0].associatednetworkid + networkid: args.context.ipAddresses[0].associatednetworkid, + listAll: true }, dataType: 'json', async: true, @@ -1946,6 +1950,7 @@ $.ajax({ url: createURL('listVirtualMachines'), data: { + listAll: true, networkid: args.context.ipAddresses[0].associatednetworkid }, dataType: 'json', @@ -2083,6 +2088,7 @@ dataType: 'json', async: true, data: { + listAll: true, id: item.virtualmachineid }, success: function(data) {