Skip to content

Commit

Permalink
Merge branch 'w2p-116047_fixed-metadataRepresentationComponent-not-al…
Browse files Browse the repository at this point in the history
…ways-using-correct-fallback_contribute-7.2' into dspace-7.6

# Conflicts:
#	src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
  • Loading branch information
alexandrevryghem committed Aug 23, 2024
2 parents f5cdd3e + bfdfbd9 commit 170fd78
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<ng-container *ngFor="let objectPage of objects; let i = index">
<ng-container *ngVar="(objectPage | async) as representations">
<ds-metadata-representation-loader *ngFor="let rep of representations"
[mdRepresentation]="rep">
[mdRepresentation]="rep"
[context]="context">
</ds-metadata-representation-loader>
<ds-themed-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-themed-loading>
<div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && representations?.length > 0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
} from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
import { BrowseService } from '../../../core/browse/browse.service';
import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service';
import { Context } from '../../../core/shared/context.model';

@Component({
selector: 'ds-metadata-representation-list',
Expand All @@ -27,6 +28,12 @@ import { BrowseDefinitionDataService } from '../../../core/browse/browse-definit
* It expects a label to put on top of the list
*/
export class MetadataRepresentationListComponent extends AbstractIncrementalListComponent<Observable<MetadataRepresentation[]>> {

/**
* The context this component is used in
*/
@Input() context: Context;

/**
* The parent of the list of related items to display
*/
Expand Down

0 comments on commit 170fd78

Please sign in to comment.