From c60800ecc38124e06767e99bd2ebcbe8062f997f Mon Sep 17 00:00:00 2001
From: Leigh Johnson <leigh-johnson@users.noreply.github.com>
Date: Wed, 6 Jul 2016 11:35:40 -0400
Subject: [PATCH] fix order_by parameter not being applied to page 2+ of list
 results (#2786)

* fix order_by parameter not being applied to page 2+ of list results, resolves #2730

* remove silliness
---
 awx/ui/client/src/helpers/PaginationHelpers.js |  6 ++++++
 awx/ui/client/src/helpers/search.js            | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/src/helpers/PaginationHelpers.js b/awx/ui/client/src/helpers/PaginationHelpers.js
index 6e0d0f63da..c1d90207e1 100644
--- a/awx/ui/client/src/helpers/PaginationHelpers.js
+++ b/awx/ui/client/src/helpers/PaginationHelpers.js
@@ -83,6 +83,9 @@ export default
                     if (scope[iterator + 'SearchFilters']){
                          new_url += _.reduce(scope[iterator+'SearchFilters'], (result, filter) => result + '&' + filter.url, '');
                     }
+                    if (scope[iterator + 'SearchParams']){
+                        new_url += '&' + scope[iterator + 'SearchParams'];
+                    }
                     new_url += '&page_size=' + scope[iterator + '_page_size'];
                     Wait('start');
                     RefreshRelated({ scope: scope, set: set, iterator: iterator, url: new_url });
@@ -149,6 +152,9 @@ export default
                     if (scope[iterator + 'SearchFilters']){
                          new_url += _.reduce(scope[iterator+'SearchFilters'], (result, filter) => result + '&' + filter.url, '');
                     }
+                    if (scope[iterator + 'SearchParams']){
+                        new_url += '&' + scope[iterator + 'SearchParams'];
+                    }
                     new_url += '&page_size=' + scope[iterator + '_page_size'];
                     Wait('start');
                     scope.getNewPage = true;
diff --git a/awx/ui/client/src/helpers/search.js b/awx/ui/client/src/helpers/search.js
index 32248a305d..e2ec35e859 100644
--- a/awx/ui/client/src/helpers/search.js
+++ b/awx/ui/client/src/helpers/search.js
@@ -103,6 +103,7 @@ export default
                         }
                     }
 
+
                     scope[iterator + 'SearchType' + modifier] = 'icontains';
                     scope[iterator + 'SearchTypeLabel' + modifier] = 'Contains';
                     scope[iterator + 'SearchParams' + modifier] = '';
@@ -428,8 +429,7 @@ export default
                     }
 
                     if (sort_order) {
-                        scope[iterator + 'SearchParams'] += (scope[iterator + 'SearchParams']) ? '&' : '';
-                        scope[iterator + 'SearchParams'] += 'order_by=' + encodeURI(sort_order);
+                        scope[iterator + 'SearchParams'] = 'order_by=' + encodeURI(sort_order);
                     }
                     e.stopPropagation();
                     scope.$emit('doSearch', iterator, page, load, calcOnly, deferWaitStop);
@@ -475,6 +475,12 @@ export default
 
 
                 scope.sort = function (iterator, fld) {
+                    // resets any existing order_by parameters in $scope.current_url;
+                    var resetOrderBy = function(){
+                        var url = _.filter(scope.current_url.split('&'), (o) => !o.includes('order_by'));
+                        scope.current_url = url.join('&');
+                    };
+                    resetOrderBy();
                     // Reset sort icons back to 'icon-sort' on all columns
                     // except the one clicked.
                     $('.list-header').each(function () {
@@ -515,7 +521,6 @@ export default
 
                     scope[list.iterator + '_current_search_params'].sort_order = sort_order;
                     Store(iterator + '_current_search_params', scope[iterator + '_current_search_params']);
-
                     scope.search(list.iterator);
                 };