Skip to content

Commit

Permalink
Merged in task/dspace-cris-2023_02_x/DSC-1944 (pull request DSpace#2316)
Browse files Browse the repository at this point in the history
Fix issue with wrong parameter when using the bulk import

Approved-by: Andrea Barbasso
  • Loading branch information
atarix83 authored and Andrea Barbasso committed Sep 30, 2024
2 parents f3c3b8f + a29186d commit 248e940
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/app/bulk-import/bulk-import-page.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h2 class="mb-3">{{ 'bulk-import.title' | translate }}</h2>
<input type="checkbox" formControlName="abortOnError" id="abortOnError" class="form-check-input" />
<label for="abortOnError" class="mr-5">{{ 'bulk-import.abort-on-error' | translate }}</label>
</div>

<button type="submit" class="btn btn-primary float-right" [disabled]="form.invalid || (isProcessingImport() | async)" >
<span *ngIf="(isProcessingImport() | async)">
<i class='fas fa-circle-notch fa-spin'></i> {{'bulk-import.processing' | translate}}
Expand All @@ -22,9 +22,9 @@ <h2 class="mb-3">{{ 'bulk-import.title' | translate }}</h2>
{{'bulk-import.submit' | translate}}
</span>
</button>
<button class="btn btn-secondary float-right mr-2" (click)="goBack()">
<button class="btn btn-outline-secondary float-right mr-2" (click)="goBack()">
{{'bulk-import.back' | translate}}
</button>

</form>
</div>
</div>
2 changes: 1 addition & 1 deletion src/app/bulk-import/bulk-import-page.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ describe('BulkImportPageComponent', () => {
expect(scriptDataService.invoke).toHaveBeenCalledWith('bulk-import', [
{ name: '-c', value: '626b80c5-ef15-4b29-8e69-bda89b0a7acf' },
{ name: '-f', value: 'test.xls' },
{ name: '-e', value: true }
{ name: '-er', value: true }
], [file]);
});

Expand Down
2 changes: 1 addition & 1 deletion src/app/bulk-import/bulk-import-page.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export class BulkImportPageComponent implements OnInit, OnDestroy {
];

if (values.abortOnError) {
stringParameters.push( { name: '-e', value: values.abortOnError } );
stringParameters.push( { name: '-er', value: values.abortOnError } );
}

this.scriptService.invoke('bulk-import', stringParameters, [file])
Expand Down

0 comments on commit 248e940

Please sign in to comment.