DigitaleBibliothek / Frontend / adf995cf369

Commits

Alexandre Vryghem authored adf995cf369 Merge 18 Apr 2024

Merge branch 'fix-broken-item-mapper-pagination_contribute-7.6' into fix-broken-item-mapper-pagination_contribute-main

# Conflicts:
#	src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
#	src/app/access-control/epeople-registry/epeople-registry.component.html
#	src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
#	src/app/access-control/group-registry/group-form/members-list/members-list.component.html
#	src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
#	src/app/process-page/overview/process-overview.component.html
#	src/app/shared/object-select/collection-select/collection-select.component.html
#	src/app/shared/object-select/collection-select/collection-select.component.ts
#	src/app/shared/object-select/item-select/item-select.component.html
#	src/app/shared/object-select/item-select/item-select.component.ts
#	src/app/shared/object-select/object-select/object-select.component.ts
#	src/app/shared/pagination/pagination.component.ts

src/app/access-control/bulk-access/browse/bulk-access-browse.component.html

Modified


30 30	</div>
31 31	</ng-template>
32 32	</li>
33 33	<li [ngbNavItem]="'selected'" role="presentation">
34 34	<a ngbNavLink>
35 35	{{'admin.access-control.bulk-access-browse.selected.header' \| translate: {number: ((objectsSelected$ \| async)?.payload?.totalElements) ? (objectsSelected$ \| async)?.payload?.totalElements : '0'} }}
36 36	</a>
37 37	<ng-template ngbNavContent>
38 38	<ds-pagination
39 39	[paginationOptions]="(paginationOptions$ \| async)"
40 -	[pageInfoState]="(objectsSelected$\|async)?.payload.pageInfo"
41 40	[collectionSize]="(objectsSelected$\|async)?.payload?.totalElements"
42 41	[objects]="(objectsSelected$\|async)"
43 42	[showPaginator]="false"
44 43	(prev)="pagePrev()"
45 44	(next)="pageNext()">
46 45	<ul *ngIf="(objectsSelected$\|async)?.hasSucceeded" class="list-unstyled ml-4">
47 46	<li *ngFor='let object of (objectsSelected$\|async)?.payload?.page \| paginate: { itemsPerPage: (paginationOptions$ \| async).pageSize,
48 47	currentPage: (paginationOptions$ \| async).currentPage, totalItems: (objectsSelected$\|async)?.payload?.page.length }; let i = index; let last = last '
49 48	class="mt-4 mb-4 d-flex"
50 49	[attr.data-test]="'list-object' \| dsBrowserOnly">

Frontend

Commits

Jira Issues

Add shortcut