From 48e996f43eb23aa75ce3ca75de02e1790e2fbe16 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Fri, 19 Dec 2014 14:26:42 -0800
Subject: [PATCH] CLOUDSTACK-6666: UI > network > VPC > Router > Public IP
 Addresses > IP Address detailView > Configuration tab > Port Forwarding >
 Select VM screen > implement keyword search.

---
 ui/scripts/network.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 2db8d271896..cc843019bd5 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, {