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

Fixed merge issue.

Browse Source
This commit is contained in:
Michael Spalti
2022-09-15 12:40:35 -07:00
parent c2da87e617
commit 7047f9ccef
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/item-page/simple/related-items/related-items-component.ts
View File

@@ -55,13 +55,10 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
*/ */
viewMode = ViewMode.ListElement; viewMode = ViewMode.ListElement;
<<<<<<< HEAD constructor(public relationshipService: RelationshipDataService, protected elementRef: ElementRef) {
constructor(public relationshipService: RelationshipService, protected elementRef: ElementRef) {
=======
constructor(public relationshipService: RelationshipDataService) {
>>>>>>> main
super(); super();
} }
ngOnInit(): void { ngOnInit(): void {
const width = this.elementRef.nativeElement.offsetWidth; const width = this.elementRef.nativeElement.offsetWidth;
this.placeholderFontClass = setPlaceHolderFontSize(width); this.placeholderFontClass = setPlaceHolderFontSize(width);

2
src/app/item-page/simple/related-items/related-items.component.html
View File

@@ -1,5 +1,4 @@
<ds-metadata-field-wrapper [label]="label" [ngClass]="placeholderFontClass"> <ds-metadata-field-wrapper [label]="label" [ngClass]="placeholderFontClass">
<div #relatedItems>
<ng-container *ngFor="let objectPage of objects; let i = index"> <ng-container *ngFor="let objectPage of objects; let i = index">
<ng-container *ngVar="(objectPage | async) as itemsRD"> <ng-container *ngVar="(objectPage | async) as itemsRD">
<ds-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page" <ds-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page"
@@ -18,5 +17,4 @@
</div> </div>
</ng-container> </ng-container>
</ng-container> </ng-container>
</div>
</ds-metadata-field-wrapper> </ds-metadata-field-wrapper>