Skip to content

Commit

Permalink
Merge pull request #3588 from DSpace/backport-3378-to-dspace-8_x
Browse files Browse the repository at this point in the history
[Port dspace-8_x] Changing the bitstream title in the submission form to use the view c…
  • Loading branch information
tdonohue authored Oct 30, 2024
2 parents 1cafe15 + 7e82716 commit b52528d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
<div class="col-md-10">
<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 class="float-right w-15">
<ng-container>
Expand All @@ -43,7 +43,6 @@ <h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})
</ng-container>
</div>
<div class="clearfix"></div>
<ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>
</div>
</div>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<ng-container *ngIf="metadata">
<ng-container *ngFor="let entry of getAllMetadataValue(fileTitleKey)">
<ng-container *ngIf="entry.value !== ''">
<h5>
<h3>
{{entry.value}}
</h5>
<span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span>
</h3>
</ng-container>
<ng-container *ngIf="entry.value === ''">
<h5 *ngIf="metadata[fileTitleKey].indexOf(entry) === 0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
import { Metadata } from '../../../../../core/shared/metadata.utils';
import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
import { isNotEmpty } from '../../../../../shared/empty.util';
import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';

Expand All @@ -31,6 +32,7 @@ import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessCo
TruncatePipe,
NgIf,
NgForOf,
FileSizePipe,
],
standalone: true,
})
Expand Down

0 comments on commit b52528d

Please sign in to comment.