From cf5d718fa8730c715cc06906bb881fff4776c60a Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Fri, 26 Feb 2016 11:44:38 -0500 Subject: [PATCH 1/3] Fixed pagination nav issue Fixes #1021 --- awx/ui/client/src/helpers/PaginationHelpers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/helpers/PaginationHelpers.js b/awx/ui/client/src/helpers/PaginationHelpers.js index d2019af8fc..f141376d8f 100644 --- a/awx/ui/client/src/helpers/PaginationHelpers.js +++ b/awx/ui/client/src/helpers/PaginationHelpers.js @@ -32,14 +32,14 @@ export default // Which page are we on? if (Empty(next) && previous) { // no next page, but there is a previous page - 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 } else if (next && Empty(previous)) { // next page available, but no previous page scope[iterator + '_page'] = 1; $('#'+iterator+'-pagination #pagination-links li:eq(1)').attr('class', 'disabled'); } else if (next && 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 From e28eec4a5663d714cdce81d3e734aa4112efad1f Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Fri, 4 Mar 2016 11:37:47 -0500 Subject: [PATCH 2/3] Fix missing semicolons --- awx/ui/client/src/helpers/PaginationHelpers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/helpers/PaginationHelpers.js b/awx/ui/client/src/helpers/PaginationHelpers.js index f141376d8f..2fd9d57bf2 100644 --- a/awx/ui/client/src/helpers/PaginationHelpers.js +++ b/awx/ui/client/src/helpers/PaginationHelpers.js @@ -32,14 +32,14 @@ export default // Which page are we on? if (Empty(next) && previous) { // no next page, but there is a previous page - scope[iterator + '_page'] = /page=\d+/.test(previous) ? parseInt(previous.match(/page=(\d+)/)[1]) + 1 : 2 + scope[iterator + '_page'] = /page=\d+/.test(previous) ? parseInt(previous.match(/page=(\d+)/)[1]) + 1 : 2; } else if (next && Empty(previous)) { // next page available, but no previous page scope[iterator + '_page'] = 1; $('#'+iterator+'-pagination #pagination-links li:eq(1)').attr('class', 'disabled'); } else if (next && previous) { // we're in between next and previous - scope[iterator + '_page'] = /page=\d+/.test(previous) ? parseInt(previous.match(/page=(\d+)/)[1]) + 1 : 2 + 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 From 5a3180433056cc2f461c25f1d6d2b94b562aaac2 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Fri, 4 Mar 2016 13:37:07 -0500 Subject: [PATCH 3/3] Just use num_pages when we're at the end of a nav list --- awx/ui/client/src/helpers/PaginationHelpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/helpers/PaginationHelpers.js b/awx/ui/client/src/helpers/PaginationHelpers.js index 2fd9d57bf2..2b131c2dc0 100644 --- a/awx/ui/client/src/helpers/PaginationHelpers.js +++ b/awx/ui/client/src/helpers/PaginationHelpers.js @@ -32,7 +32,7 @@ export default // Which page are we on? if (Empty(next) && previous) { // no next page, but there is a previous page - scope[iterator + '_page'] = /page=\d+/.test(previous) ? parseInt(previous.match(/page=(\d+)/)[1]) + 1 : 2; + scope[iterator + '_page'] = scope[iterator + '_num_pages']; } else if (next && Empty(previous)) { // next page available, but no previous page scope[iterator + '_page'] = 1;