Skip to content

Commit 978923a

Browse files
FrancescoMolinarovins01-4science
authored andcommitted
Merged in task/dspace-cris-2024_02_x/DSC-2555 (pull request DSpace#3702)
[DSC-2555] fix duplicated version notice Approved-by: Andrea Barbasso
2 parents 3e6fdd5 + 3205fc7 commit 978923a

1 file changed

Lines changed: 19 additions & 15 deletions

File tree

src/app/item-page/simple/item-page.component.html

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,25 @@
22
<div
33
[ngClass]="{'container': (itemRD?.hasSucceeded && !itemRD?.hasNoContent) && tabsRD?.payload?.pageInfo?.totalElements < 1}"
44
*ngVar="(itemRD$ | async) as itemRD">
5-
<div [ngClass]="{'container': (itemRD?.hasSucceeded && !itemRD?.hasNoContent) && tabsRD?.payload?.pageInfo?.totalElements > 0}">
6-
<ds-item-versions-notice [item]="itemRD?.payload" ></ds-item-versions-notice>
7-
</div>
8-
<div class="item-page" *ngIf="(itemRD?.hasSucceeded && !itemRD?.hasNoContent) && tabsRD?.payload?.pageInfo?.totalElements < 1" @fadeInOut>
9-
<div *ngIf="itemRD?.payload as item">
10-
<ds-item-alerts [item]="item"></ds-item-alerts>
11-
<ds-qa-event-notification [item]="item"></ds-qa-event-notification>
12-
<ds-notify-requests-status [itemUuid]="item.uuid"></ds-notify-requests-status>
13-
<ds-item-versions-notice [item]="item"></ds-item-versions-notice>
14-
<ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
15-
<ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions>
5+
<ng-container *ngVar="((itemRD?.hasSucceeded && !itemRD?.hasNoContent) && tabsRD?.payload?.pageInfo?.totalElements > 0) as isCrisItemPage">
6+
<ng-container *ngIf="isCrisItemPage">
7+
<div [ngClass]="{'container': isCrisItemPage}">
8+
<ds-item-versions-notice [item]="itemRD?.payload" ></ds-item-versions-notice>
9+
</div>
10+
</ng-container>
11+
<div class="item-page" *ngIf="(itemRD?.hasSucceeded && !itemRD?.hasNoContent) && tabsRD?.payload?.pageInfo?.totalElements < 1" @fadeInOut>
12+
<div *ngIf="itemRD?.payload as item">
13+
<ds-item-alerts [item]="item"></ds-item-alerts>
14+
<ds-qa-event-notification [item]="item"></ds-qa-event-notification>
15+
<ds-notify-requests-status [itemUuid]="item.uuid"></ds-notify-requests-status>
16+
<ds-item-versions-notice [item]="item"></ds-item-versions-notice>
17+
<ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
18+
<ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions>
19+
</div>
1620
</div>
17-
</div>
18-
<ds-cris-item-page *ngIf="(itemRD?.hasSucceeded && !itemRD?.hasNoContent) && tabsRD?.payload?.pageInfo?.totalElements > 0"></ds-cris-item-page>
19-
<ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
20-
<ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
21+
<ds-cris-item-page *ngIf="isCrisItemPage"></ds-cris-item-page>
22+
<ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
23+
<ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
24+
</ng-container>
2125
</div>
2226
</div>

0 commit comments

Comments
 (0)