External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #227 from mabashian/2895-pagination

Browse Source 
Small pagination fixes when changing page size
This commit is contained in:
Michael Abashian 2017-08-09 10:34:14 -04:00 committed by GitHub
commit d39de55168
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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("<a id=\"period-dropdown\" class=\"DashboardGraphs-filterDropdownText DashboardGraphs-filterDropdownItems--period\" role=\"button\" data-toggle=\"dropdown\" data-target=\"#\" href=\"/page.html\">"+id+
"<i class=\"fa fa-angle-down DashboardGraphs-filterIcon\"></i>\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() {