Repository: cloudstack Updated Branches: refs/heads/4.5 a771c7d49 -> 48e996f43
CLOUDSTACK-6666: UI > network > VPC > Router > Public IP Addresses > IP Address detailView > Configuration tab > Port Forwarding > 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/48e996f4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48e996f4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48e996f4 Branch: refs/heads/4.5 Commit: 48e996f43eb23aa75ce3ca75de02e1790e2fbe16 Parents: a771c7d Author: Jessica Wang <jessicaw...@apache.org> Authored: Fri Dec 19 14:26:42 2014 -0800 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Fri Dec 19 14:26:42 2014 -0800 ---------------------------------------------------------------------- ui/scripts/network.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e996f4/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 2db8d27..cc84301 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -4110,18 +4110,18 @@ dataProvider: singleVmSecondaryIPSubselect }, dataProvider: function(args) { - var networkid; - if ('vpc' in args.context) + var data = {}; + listViewDataProvider(args, data); + + var networkid; + 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, - listAll: true, - networkid: networkid - }; + } + $.extend(data, { + networkid: networkid + }); if (!args.context.projects) { $.extend(data, {
