External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 18:50:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1064 from anoek/devel

Browse Source 
Fixed pagination nav issue
This commit is contained in:
Akita Noek
2016-03-04 14:00:24 -05:00
parent 29e0652bfc 5a31804330
commit e5b0e2aeb3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,14 +32,14 @@ export default
// Which page are we on? // Which page are we on?
if (Empty(next) && previous) { if (Empty(next) && previous) {
// no next page, but there is a previous page // no next page, but there is a previous page
scope[iterator + '_page'] = parseInt(previous.match(/page=\d+/)[0].replace(/page=/, '')) + 1; scope[iterator + '_page'] = scope[iterator + '_num_pages'];
} else if (next && Empty(previous)) { } else if (next && Empty(previous)) {
// next page available, but no previous page // next page available, but no previous page
scope[iterator + '_page'] = 1; scope[iterator + '_page'] = 1;
$('#'+iterator+'-pagination #pagination-links li:eq(1)').attr('class', 'disabled'); $('#'+iterator+'-pagination #pagination-links li:eq(1)').attr('class', 'disabled');
} else if (next && previous) { } else if (next && previous) {
// we're in between next and previous // we're in between next and previous
scope[iterator + '_page'] = parseInt(previous.match(/page=\d+/)[0].replace(/page=/, '')) + 1; scope[iterator + '_page'] = /page=\d+/.test(previous) ? parseInt(previous.match(/page=(\d+)/)[1]) + 1 : 2;
} }
// Calc the range of up to 10 pages to show // Calc the range of up to 10 pages to show