External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 23:17:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixed pagination error on related sets. Initial page size was not being set and first page number set to 0 rather than 1.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-02-07 16:13:29 -05:00
parent f02a93c333
commit a1e7b28380
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/js/helpers/PaginationHelpers.js
View File

@@ -68,9 +68,10 @@ angular.module('PaginationHelpers', ['Utilities', 'RefreshHelper', 'RefreshRelat
scope[relatedSets[key].iterator + '_page_size'] = cookieSize;
}
else {
scope[relatedSets[key].iterator + '_page'] = 0;
scope[relatedSets[key].iterator + '_page'] = 1;
scope[relatedSets[key].iterator + '_page_size'] = pageSize;
}
console.log('setting ' + relatedSets[key].iterator + ' page_size: ' + pageSize);
}
scope.getPage = function(page, set, iterator) {

4
awx/ui/static/js/helpers/related-search.js
View File

@@ -192,10 +192,10 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities','RefreshRelat
else {
scope[iterator + 'SearchParams'] = (sort_order) ? 'order_by=' + escape(sort_order) : '';
}
scope[iterator + 'Page'] = 0;
scope[iterator + '_page'] = 1;
url += (url.match(/\/$/)) ? '?' : '&';
url += scope[iterator + 'SearchParams'];
url += (scope[iterator + 'PageSize']) ? '&page_size=' + scope[iterator + 'PageSize'] : "";
url += (scope[iterator + '_page_size']) ? '&page_size=' + scope[iterator + '_page_size'] : "";
RefreshRelated({ scope: scope, set: set, iterator: iterator, url: url });
}