From a1e7b28380126129712aee4ce9a17af0008f6b73 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Fri, 7 Feb 2014 16:13:29 -0500 Subject: [PATCH] Fixed pagination error on related sets. Initial page size was not being set and first page number set to 0 rather than 1. --- awx/ui/static/js/helpers/PaginationHelpers.js | 3 ++- awx/ui/static/js/helpers/related-search.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/awx/ui/static/js/helpers/PaginationHelpers.js b/awx/ui/static/js/helpers/PaginationHelpers.js index d194dd74ca..0686a2813c 100644 --- a/awx/ui/static/js/helpers/PaginationHelpers.js +++ b/awx/ui/static/js/helpers/PaginationHelpers.js @@ -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) { diff --git a/awx/ui/static/js/helpers/related-search.js b/awx/ui/static/js/helpers/related-search.js index 48210c0676..018daefaec 100644 --- a/awx/ui/static/js/helpers/related-search.js +++ b/awx/ui/static/js/helpers/related-search.js @@ -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 }); }