#150 Merge fixes

This commit is contained in:
Jonas Van Goolen
2017-11-15 10:28:11 +01:00
parent ee099e275c
commit d1b225bd95
7 changed files with 15 additions and 33 deletions

View File

@@ -10,9 +10,9 @@
(sortDirectionChange)="onSortDirectionChange($event)"
(sortFieldChange)="onSortDirectionChange($event)"
(paginationChange)="onPaginationChange($event)">
<div class="row mt-2" *ngIf="objects.hasSucceeded | async" @fadeIn>
<div class="row mt-2" *ngIf="objects?.hasSucceeded" @fadeIn>
<div class="col-lg-4 col-sm-6 col-xs-12 "
*ngFor="let object of (objects.payload | async) | paginate: { itemsPerPage: (pageInfo | async)?.elementsPerPage, currentPage: (pageInfo | async)?.currentPage, totalItems: (pageInfo | async)?.totalElements }">
*ngFor="let object of objects?.payload">
<ds-wrapper-grid-element [object]="object"></ds-wrapper-grid-element>
</div>
</div>