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

Merge pull request #2997 from jlmitch5/fixPageSelector

Browse Source 
fix filter page size selector
This commit is contained in:
John Mitchell
2018-09-13 10:42:50 -04:00
committed by GitHub
parent 5e16c72d30 1d8bb47726
commit 70629ef7f3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/src/shared/paginate/paginate.controller.js
View File

@@ -15,12 +15,11 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q
"<i class=\"fa fa-angle-down DashboardGraphs-filterIcon\"></i>\n"); "<i class=\"fa fa-angle-down DashboardGraphs-filterIcon\"></i>\n");
if ($scope.querySet){ if ($scope.querySet){
let origQuerySet = _.cloneDeep($scope.querySet); $scope.querySet = _.merge($scope.querySet, { page_size: `${pageSize}`});
queryset = _.merge(origQuerySet, { page_size: pageSize });
} else { } else {
queryset = _.merge($stateParams[`${$scope.iterator}_search`], { page_size: pageSize, page: 1 }); $scope.querySet = _.merge($stateParams[`${$scope.iterator}_search`], { page_size: `${pageSize}`});
} }
$scope.toPage(); $scope.toPage(1);
}; };
$scope.toPage = function(page) { $scope.toPage = function(page) {