nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK 885: Remove pager from empty workbasket list

This commit is contained in:
BVier 2019-11-05 15:40:48 +01:00 committed by Mustapha Zorgati
parent b6be17c0b3
commit f62bd7d158
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java
View File

@ -68,7 +68,7 @@ public abstract class AbstractPagingController {
long page = getPage(param);
PageMetadata pageMetadata = new PageMetadata(pageSize, page,
totalElements != 0 ? totalElements : Integer.MAX_VALUE);
totalElements >= 0 ? totalElements : Integer.MAX_VALUE);
if (pageMetadata.getNumber() > pageMetadata.getTotalPages()) {
// unfortunately no setter for number
pageMetadata = new PageMetadata(pageSize, pageMetadata.getTotalPages(), totalElements);

4
web/src/app/shared/pagination/pagination.component.html
View File

@ -1,6 +1,6 @@
<ul id="wb-pagination" class="pagination vertical-center">
<li>
<a (click)="changeToPage(1)" aria-label="First">
<a *ngIf="hasItems" (click)="changeToPage(1)" aria-label="First">
First</a>
</li>
<li *ngFor="let pageNumber of page?.totalPages | spreadNumber: page?.number: maxPagesAvailable">
@ -10,7 +10,7 @@
</a>
</li>
<li>
<a (click)="changeToPage(page?.totalPages)" aria-label="Last">Last</a>
<a *ngIf="hasItems" (click)="changeToPage(page?.totalPages)" aria-label="Last">Last</a>
</li>
</ul>
<span class="footer pull-right">

2
web/src/app/shared/pagination/pagination.component.ts
View File

@ -25,6 +25,7 @@ export class PaginationComponent implements OnChanges {
changePage = new EventEmitter<number>();
@Input()
numberOfItems: number;
hasItems = true;
previousPageSelected = 1;
pageSelected = 1;
maxPagesAvailable = 8;
@ -35,6 +36,7 @@ export class PaginationComponent implements OnChanges {
if (changes.page && changes.page.currentValue) {
this.pageSelected = changes.page.currentValue.number;
}
this.hasItems = this.numberOfItems > 0;
}
changeToPage(page) {