External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2651 from leigh-johnson/2645

Browse Source 
Apply search filters to pages 2+ of list results
This commit is contained in:
Leigh Johnson
2016-06-27 15:59:10 -04:00
committed by GitHub
parent 5456b209ac 298878da8e
commit a62573d45c
1 changed files with 8 additions and 4 deletions
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; return;
} }
new_url += connect + 'page=' + page; new_url += connect + 'page=' + page;
new_url += (scope[iterator + 'SearchParams']) ? '&' + scope[iterator + 'SearchParams'] + if (scope[iterator + 'SearchFilters']){
'&page_size=' + scope[iterator + '_page_size'] : 'page_size=' + scope[iterator + 'PageSize']; new_url += _.reduce(scope[iterator+'SearchFilters'], (result, filter) => result + '&' + filter.url, '');
}
new_url += '&page_size=' + scope[iterator + '_page_size'];
Wait('start'); Wait('start');
RefreshRelated({ scope: scope, set: set, iterator: iterator, url: new_url }); RefreshRelated({ scope: scope, set: set, iterator: iterator, url: new_url });
}; };
@@ -144,8 +146,10 @@ export default
return; return;
} }
new_url += connect + 'page=' + page; new_url += connect + 'page=' + page;
new_url += (scope[iterator + 'SearchParams']) ? '&' + scope[iterator + 'SearchParams'] + if (scope[iterator + 'SearchFilters']){
'&page_size=' + scope[iterator + '_page_size'] : '&page_size=' + scope[iterator + 'PageSize']; new_url += _.reduce(scope[iterator+'SearchFilters'], (result, filter) => result + '&' + filter.url, '');
}
new_url += '&page_size=' + scope[iterator + '_page_size'];
Wait('start'); Wait('start');
scope.getNewPage = true; scope.getNewPage = true;
Refresh({ scope: scope, set: set, iterator: iterator, url: new_url }); Refresh({ scope: scope, set: set, iterator: iterator, url: new_url });