External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 03:10:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

fixed search pagination url issue

Browse Source
This commit is contained in:
John Mitchell 2016-10-06 16:13:38 -04:00
parent 4a4c55a75c
commit f35fcf86e7
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
awx/ui/client/src/helpers/refresh.js
View File

@ -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;

3
awx/ui/client/src/search/tagSearch.controller.js
View File

@ -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() {