From 5b4b5329590caa84e67083d1d2a6a7acd7a375ac Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 8 Aug 2017 15:49:50 -0400 Subject: [PATCH] Small pagination fixes when changing page size --- awx/ui/client/src/shared/paginate/paginate.controller.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/shared/paginate/paginate.controller.js b/awx/ui/client/src/shared/paginate/paginate.controller.js index f4002f6ac5..38d02b279f 100644 --- a/awx/ui/client/src/shared/paginate/paginate.controller.js +++ b/awx/ui/client/src/shared/paginate/paginate.controller.js @@ -27,17 +27,17 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q } $scope.filter = function(id){ - $scope.pageSize = Number(id); + let pageSize = Number(id); $('#period-dropdown') .replaceWith(""+id+ "\n"); if($scope.querySet){ let origQuerySet = _.cloneDeep($scope.querySet); - queryset = _.merge(origQuerySet, { page_size: $scope.pageSize }); + queryset = _.merge(origQuerySet, { page_size: pageSize }); } else { - queryset = _.merge($stateParams[`${$scope.iterator}_search`], { page_size: $scope.pageSize, page: 1 }); + queryset = _.merge($stateParams[`${$scope.iterator}_search`], { page_size: pageSize, page: 1 }); } $scope.toPage(); }; @@ -76,8 +76,6 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q $scope.dataset = res.data; $scope.collection = res.data.results; }); - $scope.pageRange = calcPageRange($scope.current, $scope.last); - $scope.dataRange = calcDataRange(); }; function calcLast() {