Repository: cloudstack Updated Branches: refs/heads/4.5 6c722c9d2 -> a771c7d49
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/a771c7d4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a771c7d4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a771c7d4 Branch: refs/heads/4.5 Commit: a771c7d496f8556c32fb025e8fd2ba5477d4bd97 Parents: 6c722c9 Author: Jessica Wang <jessicaw...@apache.org> Authored: Fri Dec 19 14:25:32 2014 -0800 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Fri Dec 19 14:25:32 2014 -0800 ---------------------------------------------------------------------- ui/scripts/network.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a771c7d4/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 156b738..2db8d27 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, {
