Merge pull request #3588 from DSpace/backport-3378-to-dspace-8_x

[Port dspace-8_x] Changing the bitstream title in the submission form to use the view c…
This commit is contained in:
Tim Donohue
2024-10-30 11:43:57 -05:00
committed by GitHub
3 changed files with 6 additions and 4 deletions

View File

@@ -18,7 +18,7 @@
</div> </div>
<div class="col-md-10"> <div class="col-md-10">
<div class="float-left w-75"> <div class="float-left w-75">
<h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3> <ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>
</div> </div>
<div class="float-right w-15"> <div class="float-right w-15">
<ng-container> <ng-container>
@@ -43,7 +43,6 @@
</ng-container> </ng-container>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>
</div> </div>
</div> </div>
</ng-container> </ng-container>

View File

@@ -2,9 +2,10 @@
<ng-container *ngIf="metadata"> <ng-container *ngIf="metadata">
<ng-container *ngFor="let entry of getAllMetadataValue(fileTitleKey)"> <ng-container *ngFor="let entry of getAllMetadataValue(fileTitleKey)">
<ng-container *ngIf="entry.value !== ''"> <ng-container *ngIf="entry.value !== ''">
<h5> <h3>
{{entry.value}} {{entry.value}}
</h5> <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span>
</h3>
</ng-container> </ng-container>
<ng-container *ngIf="entry.value === ''"> <ng-container *ngIf="entry.value === ''">
<h5 *ngIf="metadata[fileTitleKey].indexOf(entry) === 0"> <h5 *ngIf="metadata[fileTitleKey].indexOf(entry) === 0">

View File

@@ -16,6 +16,7 @@ import {
import { Metadata } from '../../../../../core/shared/metadata.utils'; import { Metadata } from '../../../../../core/shared/metadata.utils';
import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model'; import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
import { isNotEmpty } from '../../../../../shared/empty.util'; import { isNotEmpty } from '../../../../../shared/empty.util';
import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe'; import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component'; import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
@@ -31,6 +32,7 @@ import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessCo
TruncatePipe, TruncatePipe,
NgIf, NgIf,
NgForOf, NgForOf,
FileSizePipe,
], ],
standalone: true, standalone: true,
}) })