This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via a7afa416d19a5c84d66a11dd9cce6f2f630f8347 (commit) from 624cbb7097be4be375324f89f26fb906e4660c9e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a7afa416d19a5c84d66a11dd9cce6f2f630f8347 Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Tue Apr 8 23:05:32 2025 +0000 LP2091648 Autopopulate background import email Automatically sets the email address for MARC Import/Export background import notifications to the current user's email address. Release-note: Fills in user email for MARC Import/Export background imports Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html index 0d63ad37de..7b40730468 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html @@ -9,7 +9,7 @@ <eg-string #loadMarcOrderTemplateDeletedString i18n-text text="Load MARC Order Record Template Deleted"></eg-string> <eg-string #loadMarcOrderTemplateSetAsDefaultString i18n-text text="Load MARC Order Record Template Set As Default"></eg-string> -<eg-alert-dialog #dupeQueueAlert i18n-dialogBody +<eg-alert-dialog #dupeQueueAlert i18n-dialogBody dialogBody="A queue with the requested name already exists."> </eg-alert-dialog> @@ -48,7 +48,7 @@ <div class="col-lg-3"> <label class="form-label" for="provider-select" i18n>Provider</label> </div> - + <div class="col-lg-3"> <eg-combobox #providerSelector domId="provider-select" @@ -65,7 +65,7 @@ <label class="form-label" for="create-po" i18n>Create Purchase Order</label> </div> <div class="col-lg-3"> - <input class="form-check-input" type="checkbox" + <input class="form-check-input" type="checkbox" id="create-po" [(ngModel)]="createPurchaseOrder"> </div> @@ -86,9 +86,9 @@ <div class="col-lg-3"> <label class="form-label" for="activate-po" i18n>Activate Purchase Order</label> </div> - + <div class="col-lg-3"> - <input class="form-check-input" type="checkbox" + <input class="form-check-input" type="checkbox" id="activate-po" [(ngModel)]="activatePurchaseOrder"> </div> @@ -134,7 +134,7 @@ <div class="col-lg-3"> <eg-combobox #bibSourceSelector id="source-select" - [entries]="formatEntries('bibSources')" + [entries]="formatEntries('bibSources')" (onChange)="selectEntry($event, 'bibSources')" [startId]="selectedBibSource"> </eg-combobox> @@ -143,12 +143,12 @@ <label class="form-label" for="import-non-matching" i18n>Import Non-Matching Records</label> </div> <div class="col-lg-3"> - <input class="form-check-input" type="checkbox" + <input class="form-check-input" type="checkbox" id="import-non-matching" [(ngModel)]="importNonMatching"> </div> </div> - + <div class="row"> <div class="col-lg-3"> <label class="form-label" for="match-set-select" i18n>Record Match Set</label> @@ -156,7 +156,7 @@ <div class="col-lg-3"> <eg-combobox #matchSetSelector id="match-set-select" - [entries]="formatEntries('matchSets')" + [entries]="formatEntries('matchSets')" [disabled]="(selectedQueue && !selectedQueue.freetext) || importSelection()" [startId]="selectedMatchSet || defaultMatchSet" (onChange)="selectEntry($event, 'matchSets')"> @@ -166,7 +166,7 @@ <label class="form-label" for="merge-on-exact" i18n>Merge On Exact Match (901c)</label> </div> <div class="col-lg-3"> - <input class="form-check-input" type="checkbox" + <input class="form-check-input" type="checkbox" id="merge-on-exact" [(ngModel)]="mergeOnExact"> </div> </div> @@ -187,7 +187,7 @@ <label class="form-label" for="merge-on-single" i18n>Merge On Single Match</label> </div> <div class="col-lg-3"> - <input class="form-check-input" type="checkbox" + <input class="form-check-input" type="checkbox" id="merge-on-single" [(ngModel)]="mergeOnSingleMatch"> </div> </div> @@ -209,7 +209,7 @@ <label class="form-label" for="merge-on-best" i18n>Merge On Best Match</label> </div> <div class="col-lg-3"> - <input class="form-check-input" type="checkbox" + <input class="form-check-input" type="checkbox" id="merge-on-best" [(ngModel)]="mergeOnBestMatch"> </div> </div> @@ -220,7 +220,7 @@ </label> </div> <div class="col-lg-3"> - <input type="number" step="0.1" id="min-quality-ratio" + <input type="number" step="0.1" id="min-quality-ratio" class="form-control" [(ngModel)]="minQualityRatio"> </div> <ng-container *ngIf="mode !== 'getImportParams'"> @@ -228,7 +228,7 @@ <label class="form-label" for="load-items" i18n>Load Items for Imported Records</label> </div> <div class="col-lg-3"> - <input class="form-check-input" type="checkbox" + <input class="form-check-input" type="checkbox" id="load-items" [(ngModel)]="loadItems"> </div> @@ -255,7 +255,7 @@ <label class="form-label" for="upload-file" i18n>File to Upload:</label> </div> <div class="col-lg-3"> - <input #fileSelector (change)="fileSelected($event)" + <input #fileSelector (change)="fileSelected($event)" id="upload-file" required class="form-control" type="file"/> </div> <div class="col-lg-3"> @@ -275,9 +275,8 @@ </div> <div class="col-lg-3"> <input [disabled]="!backgroundImportForUpload" - class="form-control" type="text" id="background-import-email" - name="background-import-email" i18n-placeholder placeholder="Email address..." - [(ngModel)]="backgroundImportEmail"> + class="form-control" type="email" autocomplete="email" id="background-import-email" + name="background-import-email" [(ngModel)]="backgroundImportEmail"> </div> </div> <div class="row" *ngIf="importSelection()"> @@ -299,14 +298,14 @@ <div class="row" *ngIf="mode !== 'getImportParams'"> <div class="d-grid gap-2 col-6 mx-auto"> <button type="button" class="btn btn-success btn-lg fw-bold" - [disabled]="isUploading || (uploadComplete && !uploadError) || !hasNeededData()" + [disabled]="isUploading || (uploadComplete && !uploadError) || !hasNeededData()" (click)="upload()" i18n>Upload</button> </div> </div> <div class="row" *ngIf="mode === 'getImportParams'"> <div class="d-grid gap-2 col-6 mx-auto"> <button type="button" class="btn btn-success btn-lg fw-bold" - [disabled]="customActionProcessing || !hasNeededData()" + [disabled]="customActionProcessing || !hasNeededData()" (click)="performCustomAction()" i18n>Submit</button> </div> </div> @@ -318,7 +317,7 @@ <eg-progress-inline #uploadProgress></eg-progress-inline> </div> </div> - + <div class="col-lg-6 offset-lg-3" [hidden]="!uploadProcessing || uploadComplete"> <h2><label class="form-label" i18n><i>Processing...</i></label></h2> diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts index 71b4575532..a3d6e31467 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts @@ -206,6 +206,7 @@ export class UploadComponent implements AfterViewInit, OnDestroy { this.minQualityRatio = 0; this.recordType = 'bib'; this.formTemplates = {}; + this.backgroundImportEmail = this.auth.user().email(); if (this.vlagent.importSelection) { if (!this.vlagent.importSelection.queue) { diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html index a7755808ca..688c4be1a5 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html @@ -285,9 +285,8 @@ </div> <div class="col-lg-3"> <input [disabled]="!backgroundImportForUpload" - class="form-control" type="text" id="background-import-email" - name="background-import-email" i18n-placeholder placeholder="Email address..." - [(ngModel)]="backgroundImportEmail"> + class="form-control" type="email" autocomplete="email" id="background-import-email" + name="background-import-email" [(ngModel)]="backgroundImportEmail"> </div> </div> <div class="row" *ngIf="importSelection()"> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts index 0598a13a8f..bb2728e695 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts @@ -173,6 +173,8 @@ export class ImportComponent implements OnInit, AfterViewInit, OnDestroy { this.recordType = 'bib'; this.bibTrashGroups = []; this.formTemplates = {}; + this.backgroundImportEmail = this.auth.user().email(); + console.debug('user email is:', this.auth.user().email()); if (this.vandelay.importSelection) { // Apply start-id values to our comboboxes based on our ----------------------------------------------------------------------- Summary of changes: .../app/staff/acq/picklist/upload.component.html | 41 +++++++++++----------- .../src/app/staff/acq/picklist/upload.component.ts | 1 + .../app/staff/cat/vandelay/import.component.html | 5 ++- .../src/app/staff/cat/vandelay/import.component.ts | 2 ++ 4 files changed, 25 insertions(+), 24 deletions(-) hooks/post-receive -- Evergreen ILS