From 8485cd9f850bea79fd7f8826b825ee8115d326b0 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 20 May 2015 14:18:45 -0400 Subject: [PATCH] Pagination left arrow shown at all times for spacing Within the pagination widget, the left (previous) arrow will always be shown now, with functionality disabled if the user is on the first page of results --- awx/ui/static/js/helpers/PaginationHelpers.js | 9 ++++++++- awx/ui/static/js/shared/generator-helpers.js | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/awx/ui/static/js/helpers/PaginationHelpers.js b/awx/ui/static/js/helpers/PaginationHelpers.js index 38eca49858..47239d4bff 100644 --- a/awx/ui/static/js/helpers/PaginationHelpers.js +++ b/awx/ui/static/js/helpers/PaginationHelpers.js @@ -28,7 +28,7 @@ export default scope[iterator + '_num_pages'] = Math.ceil((count / scope[iterator + '_page_size'])); scope[iterator + '_num_pages'] = (scope[iterator + '_num_pages'] <= 0) ? 1 : scope[iterator + '_num_pages']; scope[iterator + '_total_rows'] = count; - + $('#pagination-links li:eq(1)').removeAttr('class'); // Which page are we on? if (Empty(next) && previous) { // no next page, but there is a previous page @@ -36,6 +36,7 @@ export default } else if (next && Empty(previous)) { // next page available, but no previous page scope[iterator + '_page'] = 1; + $('#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; @@ -75,6 +76,9 @@ export default scope.getPage = function (page, set, iterator) { var new_url = scope[iterator + '_url'].replace(/.page\=\d+/, ''), connect = (/\/$/.test(new_url)) ? '?' : '&'; + if(scope[iterator + '_page'] === 1 && page === 0){ + 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']; @@ -136,6 +140,9 @@ export default scope.getPage = function (page, set, iterator) { var new_url = scope[iterator + '_url'].replace(/.page\=\d+/, ''), connect = (/\/$/.test(new_url)) ? '?' : '&'; + if(scope[iterator + '_page'] === 1 && page === 0){ + 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']; diff --git a/awx/ui/static/js/shared/generator-helpers.js b/awx/ui/static/js/shared/generator-helpers.js index ac317d7608..37a9517dc1 100644 --- a/awx/ui/static/js/shared/generator-helpers.js +++ b/awx/ui/static/js/shared/generator-helpers.js @@ -799,7 +799,7 @@ angular.module('GeneratorHelpers', [systemStatus.name]) html += "
  • " + "
  • \n"; - html += "
  • " + "
  • \n";