hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 05:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

#150 Merge fixes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/shared/object-grid/object-grid.component.html
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>

4
src/app/shared/object-grid/object-grid.component.scss
View File

@@ -17,6 +17,10 @@ ds-wrapper-grid-element ::ng-deep {
overflow: hidden;
text-overflow: ellipsis;
}
.item-authors{
line-height: $line-height-base;
height: ($line-height-base*1.5)+em;
}
div.card {
margin-bottom: 20px;
}

4
src/app/shared/object-grid/object-grid.component.ts
View File

@@ -64,12 +64,12 @@ export class ObjectGridComponent implements OnChanges, OnInit {
ngOnChanges(changes: SimpleChanges) {
if (changes.objects && !changes.objects.isFirstChange()) {
this.pageInfo = this.objects.pageInfo;
// this.pageInfo = this.objects.pageInfo;
}
}
ngOnInit(): void {
this.pageInfo = this.objects.pageInfo;
// this.pageInfo = this.objects.pageInfo;
}
/**