From e1fbe9e5301182b879563b74d738262bb0b21c09 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 10 Jul 2012 18:56:28 -0700 Subject: [PATCH] cloudstack 3.0 UI - VPC - IP Addresses - Load Balancer - Add VM - populate only VMs under selected tier. --- ui/scripts/network.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index cd0a92914db..28b06cc2404 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2027,10 +2027,17 @@ dataProvider: function(args) { var itemData = $.isArray(args.context.multiRule) && args.context.multiRule[0]['_itemData'] ? args.context.multiRule[0]['_itemData'] : []; + + 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: args.context.ipAddresses[0].associatednetworkid, + networkid: networkid, listAll: true };