diff --git a/awx/ui/client/src/helpers/PaginationHelpers.js b/awx/ui/client/src/helpers/PaginationHelpers.js index 2fd9d57bf2..6e0d0f63da 100644 --- a/awx/ui/client/src/helpers/PaginationHelpers.js +++ b/awx/ui/client/src/helpers/PaginationHelpers.js @@ -80,8 +80,10 @@ export default return; } new_url += connect + 'page=' + page; - new_url += (scope[iterator + 'SearchParams']) ? '&' + scope[iterator + 'SearchParams'] + - '&page_size=' + scope[iterator + '_page_size'] : 'page_size=' + scope[iterator + 'PageSize']; + if (scope[iterator + 'SearchFilters']){ + new_url += _.reduce(scope[iterator+'SearchFilters'], (result, filter) => result + '&' + filter.url, ''); + } + new_url += '&page_size=' + scope[iterator + '_page_size']; Wait('start'); RefreshRelated({ scope: scope, set: set, iterator: iterator, url: new_url }); }; @@ -144,8 +146,10 @@ export default return; } new_url += connect + 'page=' + page; - new_url += (scope[iterator + 'SearchParams']) ? '&' + scope[iterator + 'SearchParams'] + - '&page_size=' + scope[iterator + '_page_size'] : '&page_size=' + scope[iterator + 'PageSize']; + if (scope[iterator + 'SearchFilters']){ + new_url += _.reduce(scope[iterator+'SearchFilters'], (result, filter) => result + '&' + filter.url, ''); + } + new_url += '&page_size=' + scope[iterator + '_page_size']; Wait('start'); scope.getNewPage = true; Refresh({ scope: scope, set: set, iterator: iterator, url: new_url });