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

apply search filters to results on pages 2+, resolves #2645

Browse Source
This commit is contained in:
Leigh Johnson 2016-06-27 11:01:08 -04:00
parent 0111787dff
commit 298878da8e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/helpers/PaginationHelpers.js
View File

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