shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

Merge pull request #1178 from mabashian/1161-templates-list-pagination

Browse Source 
Fixed templates list pagination
This commit is contained in:
Michael Abashian 2018-04-02 13:44:33 -04:00 committed by GitHub
commit 8ad9d07896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
awx/ui/client/features/templates/list-templates.controller.js
View File

@ -46,17 +46,19 @@ function ListTemplatesController(
$scope.canAdd = ($scope.canAddJobTemplate || $scope.canAddWorkflowJobTemplate);
// smart-search
const name = 'templates';
const iterator = 'template';
const key = 'template_dataset';
$scope.list = { iterator, name };
$scope.collection = { iterator, basePath: 'unified_job_templates' };
$scope[key] = Dataset.data;
$scope[name] = Dataset.data.results;
$scope.list = {
iterator: 'template',
name: 'templates'
};
$scope.collection = {
iterator: 'template',
basePath: 'unified_job_templates'
};
$scope.template_dataset = Dataset.data;
$scope.templates = Dataset.data.results;
$scope.$on('updateDataset', (e, dataset) => {
$scope[key] = dataset;
$scope[name] = dataset.results;
$scope.template_dataset = dataset;
$scope.templates = dataset.results;
});
vm.isInvalid = (template) => {

5
awx/ui/client/features/templates/list.view.html
View File

@ -114,11 +114,10 @@
</at-row>
</at-list>
<paginate
collection="collection"
collection="templates"
dataset="template_dataset"
iterator="template"
base-path="unified_job_templates"
query-set="querySet">
base-path="unified_job_templates">
</paginate>
</at-panel-body>
</at-panel>

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

@ -5,45 +5,26 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q
queryset, path;
$scope.pageSize = pageSize;
$scope.basePageSize = parseInt(pageSize) === 5 ? 5 : 20;
$scope.maxVisiblePages = $scope.maxVisiblePages ? parseInt($scope.maxVisiblePages) : 10;
function init() {
let updatePaginationVariables = function() {
$scope.pageSize = calcPageSize();
$scope.current = calcCurrent();
$scope.last = calcLast();
$scope.pageRange = calcPageRange($scope.current, $scope.last);
$scope.dataRange = calcDataRange();
};
updatePaginationVariables();
$scope.$watch('collection', function(){
updatePaginationVariables();
});
}
$scope.filter = function(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){
if ($scope.querySet){
let origQuerySet = _.cloneDeep($scope.querySet);
queryset = _.merge(origQuerySet, { page_size: pageSize });
}
else {
} else {
queryset = _.merge($stateParams[`${$scope.iterator}_search`], { page_size: pageSize, page: 1 });
}
$scope.toPage();
};
$scope.toPage = function(page) {
if(page === 0 || page > $scope.last) {
if (page === 0 || page > $scope.last) {
return;
}
if (GetBasePath($scope.basePath) || $scope.basePath) {
@ -52,24 +33,23 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q
let interpolator = $interpolate($scope.basePath);
path = interpolator({ $stateParams: $stateParams });
}
if($scope.querySet) {
if ($scope.querySet) {
// merging $scope.querySet seems to destroy our initial reference which
// kills the two-way binding here. To fix that, clone the queryset first
// and merge with that object.
let origQuerySet = _.cloneDeep($scope.querySet);
queryset = _.merge(origQuerySet, { page: page });
}
else {
} else {
queryset = _.merge($stateParams[`${$scope.iterator}_search`], { page: page });
}
if(!$scope.querySet) {
if (!$scope.querySet) {
$state.go('.', {
[$scope.iterator + '_search']: queryset
}, {notify: false});
}
qs.search(path, queryset).then((res) => {
if($scope.querySet) {
if ($scope.querySet) {
// Update the query set
$scope.querySet = queryset;
}
@ -83,10 +63,9 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q
}
function calcCurrent() {
if($scope.querySet) {
if ($scope.querySet) {
return parseInt($scope.querySet.page || '1');
}
else {
} else {
return parseInt($stateParams[`${$scope.iterator}_search`].page || '1');
}
}
@ -96,23 +75,20 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q
maxVisiblePages = parseInt($scope.maxVisiblePages),
pagesLeft,
pagesRight;
if(maxVisiblePages % 2) {
if (maxVisiblePages % 2) {
// It's an odd number
pagesLeft = (maxVisiblePages - 1) / 2;
pagesRight = ((maxVisiblePages - 1) / 2) + 1;
}
else {
} else {
// Its an even number
pagesLeft = pagesRight = maxVisiblePages / 2;
}
if (last < maxVisiblePages) {
// Don't have enough pages to exceed the max range - just show all of them
result = _.range(1, last + 1);
}
else if(current === last) {
} else if (current === last) {
result = _.range(last + 1 - maxVisiblePages, last + 1);
}
else {
} else {
let topOfRange = current + pagesRight > maxVisiblePages + 1 ? (current + pagesRight < last + 1 ? current + pagesRight : last + 1) : maxVisiblePages + 1;
let bottomOfRange = (topOfRange === last + 1) ? last + 1 - maxVisiblePages : (current - pagesLeft > 0 ? current - pagesLeft : 1);
result = _.range(bottomOfRange, topOfRange);
@ -137,6 +113,18 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q
return Number(pageSize) ;
}
init();
let updatePaginationVariables = function() {
$scope.pageSize = calcPageSize();
$scope.current = calcCurrent();
$scope.last = calcLast();
$scope.pageRange = calcPageRange($scope.current, $scope.last);
$scope.dataRange = calcDataRange();
};
updatePaginationVariables();
$scope.$watch('collection', function(){
updatePaginationVariables();
});
}
];