CLOUDSTACK-6666: UI > network > VPC > Router > Public IP Addresses > IP Address detailView > Configuration tab > Load Balancing > Select VM screen > implement keyword search.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5fea96fd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fea96fd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5fea96fd Branch: refs/heads/reporter Commit: 5fea96fdc29166eba6937f40d7956283653265b7 Parents: 8bcde02 Author: Jessica Wang <[email protected]> Authored: Fri Dec 19 14:25:32 2014 -0800 Committer: Jessica Wang <[email protected]> Committed: Fri Dec 19 14:28:45 2014 -0800 ---------------------------------------------------------------------- ui/scripts/network.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fea96fd/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 44e66b6..1d9e490 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3357,18 +3357,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, {
