From f35fcf86e73739b85a32a1ba18e68ac2b3036c98 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 6 Oct 2016 16:13:38 -0400
Subject: [PATCH] fixed search pagination url issue

---
 awx/ui/client/src/helpers/refresh.js          | 22 ++++++++++++++++++-
 .../client/src/search/tagSearch.controller.js |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/src/helpers/refresh.js b/awx/ui/client/src/helpers/refresh.js
index 5755cd934e..57c806f64a 100644
--- a/awx/ui/client/src/helpers/refresh.js
+++ b/awx/ui/client/src/helpers/refresh.js
@@ -71,7 +71,27 @@ export default
 
             // if you're editing an object, make sure you're on the right
             // page to display the element you are editing
-            if (scope.addedItem) {
+            if (params.fromSearch) {
+                var url = params.url;
+                // for a search, we want to make sure to get the first page of
+                // results
+                if (url.indexOf("page=") > -1) {
+                    // if the url includes a page, remove that part
+                    var urlArr = url.split("page=");
+                    var afterPageUrlArr = urlArr[1].split("&");
+
+                    if (afterPageUrlArr.length > 1) {
+                        // if there's stuff after the page part,
+                        // put that back in
+                        afterPageUrlArr.shift();
+                        url = urlArr[0] +
+                            afterPageUrlArr.join("&");
+                    } else {
+                        url = urlArr[0];
+                    }
+                }
+                getPage(url);
+            } else if (scope.addedItem) {
                 id = scope.addedItem + "";
                 delete scope.addedItem;
                 $rootScope.rowBeingEdited = id;
diff --git a/awx/ui/client/src/search/tagSearch.controller.js b/awx/ui/client/src/search/tagSearch.controller.js
index e50a25670e..0209329110 100644
--- a/awx/ui/client/src/search/tagSearch.controller.js
+++ b/awx/ui/client/src/search/tagSearch.controller.js
@@ -72,7 +72,8 @@ export default ['$scope', 'Refresh', 'tagSearchService', '$stateParams',
                 scope: listScope,
                 set: set,
                 iterator: iterator,
-                url: url
+                url: url,
+                fromSearch: true
             });
 
             listScope.$on('PostRefresh', function() {