From a771c7d496f8556c32fb025e8fd2ba5477d4bd97 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 19 Dec 2014 14:25:32 -0800 Subject: [PATCH] CLOUDSTACK-6666: UI > network > VPC > Router > Public IP Addresses > IP Address detailView > Configuration tab > Load Balancing > Select VM screen > implement keyword search. --- ui/scripts/network.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 156b738f908..2db8d271896 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3347,18 +3347,18 @@ dataProvider: function(args) { var itemData = $.isArray(args.context.multiRule) && args.context.subItemData ? args.context.subItemData : []; + var data = {}; + listViewDataProvider(args, data); + var networkid; - if ('vpc' in args.context) + if ('vpc' in args.context) { networkid = args.context.multiData.tier; - else + } else { networkid = args.context.ipAddresses[0].associatednetworkid; - - var data = { - page: args.page, - pageSize: pageSize, - networkid: networkid, - listAll: true - }; + } + $.extend(data, { + networkid: networkid + }); if (!args.context.projects) { $.extend(data, {