July 2025 - Evergreen-commits - Evergreen Mailing Lists Server

[GIT] Evergreen ILS branch main updated. 19f506ea9e336a787cb4957dd5153c6e2970d2cf
by Git User 11 Jul '25

11 Jul '25

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, main has been updated via 19f506ea9e336a787cb4957dd5153c6e2970d2cf (commit) from 2fffeee8067fc3e2652defb0365a87a386f671a6 (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 19f506ea9e336a787cb4957dd5153c6e2970d2cf Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Fri Jul 11 15:18:26 2025 -0700 LP2111948: follow-up: ng lint fixes Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index 4d58bc0f66..a3f577e91f 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -440,7 +440,7 @@ export class MarcEditContext { } // Focus the requested subfield by its position. - focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | "group" | "move") { + focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | 'group' | 'move') { // console.debug("focusSubfield()", field, position, group); const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 94b12eeb91..3e2dd46440 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -214,9 +214,9 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { case 'ArrowLeft': - case 'ArrowRight': + case 'ArrowRight': { // console.debug("ArrowRight: ", evt, field, subfield); - // eslint-disable-next-line no-case-declarations + const el = evt.target as HTMLElement; // do nothing if we are in a text input if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { @@ -225,10 +225,10 @@ export class MarcRichEditorComponent implements OnInit { // otherwise, move focus from the group to the subfield code if it's empty, or the value if not evt.preventDefault(); evt.stopPropagation(); - const target = subfield[0] == ' ' ? 'sfc' : 'sfv'; + const target = subfield[0] === ' ' ? 'sfc' : 'sfv'; this.context.focusSubfield(field, subfield[2], target); break; - + } // all remaining shortcuts duplicated from editable-content.component.ts // minus combobox shortcuts case 'y': ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts | 2 +- .../eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 2fffeee8067fc3e2652defb0365a87a386f671a6
by Git User 11 Jul '25

11 Jul '25

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, main has been updated via 2fffeee8067fc3e2652defb0365a87a386f671a6 (commit) from bbf7a9c55a5e3999785a9f7fdaebad5cc1b3895d (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 2fffeee8067fc3e2652defb0365a87a386f671a6 Author: Jane Sandberg <js7389(a)princeton.edu> Date: Fri Jul 4 08:49:43 2025 -0700 LP2115993: Migrate to bundler moduleResolution moduleResolution: node is no longer recommended as of Typescript 5 See https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-0.h… To test: * Build the angular client in both dev and production mode * Run tests * Run lint * Export strings for translation * Confirm that all of the above works as expected Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/tsconfig.json b/Open-ILS/src/eg2/tsconfig.json index e2352a89ad..c081583f78 100644 --- a/Open-ILS/src/eg2/tsconfig.json +++ b/Open-ILS/src/eg2/tsconfig.json @@ -5,7 +5,7 @@ "sourceMap": true, "declaration": false, "module": "esnext", - "moduleResolution": "node", + "moduleResolution": "bundler", "experimentalDecorators": true, "useDefineForClassFields": false, "target": "es2022", ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. bbf7a9c55a5e3999785a9f7fdaebad5cc1b3895d
by Git User 11 Jul '25

11 Jul '25

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, main has been updated via bbf7a9c55a5e3999785a9f7fdaebad5cc1b3895d (commit) from 620b4ec28636e6bc615901eb3db975586983a00d (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 bbf7a9c55a5e3999785a9f7fdaebad5cc1b3895d Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Jun 30 16:08:15 2025 +0000 LP2115662 holds table: individual row actions Adds individual suspend, activate, and cancel buttons for items in the OPAC holds table. Also adds an ID attribute to the title so it can be used with aria-describedby to associate each button with the item it affects. Release-note: Adds individual suspend, activate, and cancel buttons to OPAC holds table rows Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Garry Collum <gcollum(a)gmail.com> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 index b2bc7257b4..ee480112e5 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 @@ -174,7 +174,7 @@ END; %] <a href="[% mkurl(ctx.opac_root _ '/record/' _ - hold.hold.bre_id, {}, 1) %]"><span[%- deemphasize_class -%]> + hold.hold.bre_id, {}, 1) %]" id="hold-record-[% row_rec_id %]"><span[%- deemphasize_class -%]> [%- title.substr(0,hold.ATTRS.nonfiling_characters) | html %]</span> [%- title.substr(hold.ATTRS.nonfiling_characters) | html %]</a> </td> @@ -231,11 +231,39 @@ [%- END; END; %] </td> <td role="cell" mobile-title="" class="fullRow"> - <a class="btn btn-confirm btn-sm" href="[% mkurl(ctx.opac_root _ '/myopac/holds/edit', {hid => ahr.id}) %]" - [% html_text_attr('title', l('Edit hold for item [_1]', attrs.title)) %]> + <a class="btn btn-confirm btn-sm nowrap m-1" href="[% mkurl(ctx.opac_root _ '/myopac/holds/edit', {hid => ahr.id}) %]" + aria-describedby="hold-record-[% row_rec_id %]" + [% html_text_attr('title', l('Edit hold for item [_1]', row_title)) %]> <i class="fas fa-edit" aria-hidden="true"></i> [% l('Edit') %] </a> + [% # Don't show the suspend button if it is suspended or fulfilled %] + [% IF hold.hold.status != '7' && hold.hold.status != '9' %] + <a class="btn btn-action btn-sm nowrap m-1" href="[% mkurl('', {action => 'suspend', 'hold_id' => ahr.id }) %]" + aria-describedby="hold-record-[% row_rec_id %]" + [% html_text_attr('title', l('Suspend hold for item [_1]', row_title)) %]> + <i class="fas fa-hand-paper" aria-hidden="true"></i> + [% l('Suspend') %] + </a> + [% END %] + [% # Show the activate button ONLY if it is suspended %] + [% IF hold.hold.status == '7' %] + <a class="btn btn-opac btn-sm nowrap m-1" href="[% mkurl('', {action => 'activate', 'hold_id' => ahr.id }) %]" + aria-describedby="hold-record-[% row_rec_id %]" + [% html_text_attr('title', l('Activate hold for item [_1]', row_title)) %]> + <i class="fas fa-play" aria-hidden="true"></i> + [% l('Activate') %] + </a> + [% END %] + [% # Don't show the cancel button if it is canceled %] + [% IF hold.hold.status != '6' %] + <a class="btn btn-danger btn-sm nowrap m-1" href="[% mkurl('', {action => 'cancel', 'hold_id' => ahr.id }) %]" + aria-describedby="hold-record-[% row_rec_id %]" + [% html_text_attr('title', l('Cancel hold for item [_1]', row_title)) %]> + <i class="fas fa-circle-xmark" aria-hidden="true"></i> + [% l('Cancel') %] + </a> + [% END %] </td> </tr> [% END %] ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/myopac/holds.tt2 | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 4a701eec7f888ffc1b314f515b24ca25ad6623c8
by Git User 11 Jul '25

11 Jul '25

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_14 has been updated via 4a701eec7f888ffc1b314f515b24ca25ad6623c8 (commit) from bc3f48a2347c8e9ee92faedf192ea5427e901bb6 (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 4a701eec7f888ffc1b314f515b24ca25ad6623c8 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Jun 6 21:02:56 2025 +0000 LP2111948 Focus on code first when adding subfield When adding a new subfield in the MARC rich editor, focus should move to the empty subfield code input first. Focus should also move to the code when pressing the right or left arrow key in a focused subfield group where the code is empty. Release-note: Focuses on subfield code input rather than value when the code is empty (as when adding a new subfield). Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Elizabeth Davis <elizabeth.davis(a)sparkpa.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index 1df38c3658..4d58bc0f66 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -249,7 +249,7 @@ export class MarcEditContext { if (action.subfield) { const prevPos = action.subfield[2] - 1; action.field.deleteExactSubfields(action.subfield); - this.focusSubfield(action.field, prevPos, true); + this.focusSubfield(action.field, prevPos, 'group'); } else { this.record.deleteFields(action.field); @@ -265,7 +265,7 @@ export class MarcEditContext { if (action.subfield) { this.insertSubfield(action.field, action.subfield, true); - this.focusSubfield(action.field, action.subfield[2]); + this.focusSubfield(action.field, action.subfield[2], 'sfv'); } else { @@ -429,7 +429,7 @@ export class MarcEditContext { field.subfields.splice(position, 0, subfield); if (!skipTracking) { - this.focusSubfield(field, position); + this.focusSubfield(field, position, 'sfc'); this.trackStructuralUndo(field, true, subfield); } } @@ -440,15 +440,12 @@ export class MarcEditContext { } // Focus the requested subfield by its position. - focusSubfield(field: MarcField, position: number, group?: boolean) { + focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | "group" | "move") { // console.debug("focusSubfield()", field, position, group); const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; - if (group) { - focus.target = 'group'; - } else if (position < 0) { - // Focus the code instead of the value - focus.target = 'sfc'; + if (target) { + focus.target = target; } focus.sfOffset = position; @@ -463,7 +460,7 @@ export class MarcEditContext { field.deleteExactSubfields(subfield); - this.focusSubfield(field, sfpos, true); + this.focusSubfield(field, sfpos, 'group'); } focusTag(field: MarcField) { diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 211f08a535..3be9e5b3aa 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -218,10 +218,11 @@ export class MarcRichEditorComponent implements OnInit { if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { return; } - // otherwise, move focus from the group to its first input (the subfield code) + // otherwise, move focus from the group to the subfield code if it's empty, or the value if not evt.preventDefault(); evt.stopPropagation(); - this.context.focusSubfield(field, subfield[2], false); + const target = subfield[0] == ' ' ? 'sfc' : 'sfv'; + this.context.focusSubfield(field, subfield[2], target); break; // all remaining shortcuts duplicated from editable-content.component.ts ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editor-context.ts | 17 +++++++---------- .../app/staff/share/marc-edit/rich-editor.component.ts | 5 +++-- 2 files changed, 10 insertions(+), 12 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 6d1da591187c4c5bb99dd5527af5701ed05cb717
by Git User 11 Jul '25

11 Jul '25

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 6d1da591187c4c5bb99dd5527af5701ed05cb717 (commit) from fbd8884461dbc944b7a14c04e9aadff74f9c6e63 (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 6d1da591187c4c5bb99dd5527af5701ed05cb717 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Jun 6 21:02:56 2025 +0000 LP2111948 Focus on code first when adding subfield When adding a new subfield in the MARC rich editor, focus should move to the empty subfield code input first. Focus should also move to the code when pressing the right or left arrow key in a focused subfield group where the code is empty. Release-note: Focuses on subfield code input rather than value when the code is empty (as when adding a new subfield). Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Elizabeth Davis <elizabeth.davis(a)sparkpa.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index 1df38c3658..4d58bc0f66 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -249,7 +249,7 @@ export class MarcEditContext { if (action.subfield) { const prevPos = action.subfield[2] - 1; action.field.deleteExactSubfields(action.subfield); - this.focusSubfield(action.field, prevPos, true); + this.focusSubfield(action.field, prevPos, 'group'); } else { this.record.deleteFields(action.field); @@ -265,7 +265,7 @@ export class MarcEditContext { if (action.subfield) { this.insertSubfield(action.field, action.subfield, true); - this.focusSubfield(action.field, action.subfield[2]); + this.focusSubfield(action.field, action.subfield[2], 'sfv'); } else { @@ -429,7 +429,7 @@ export class MarcEditContext { field.subfields.splice(position, 0, subfield); if (!skipTracking) { - this.focusSubfield(field, position); + this.focusSubfield(field, position, 'sfc'); this.trackStructuralUndo(field, true, subfield); } } @@ -440,15 +440,12 @@ export class MarcEditContext { } // Focus the requested subfield by its position. - focusSubfield(field: MarcField, position: number, group?: boolean) { + focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | "group" | "move") { // console.debug("focusSubfield()", field, position, group); const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; - if (group) { - focus.target = 'group'; - } else if (position < 0) { - // Focus the code instead of the value - focus.target = 'sfc'; + if (target) { + focus.target = target; } focus.sfOffset = position; @@ -463,7 +460,7 @@ export class MarcEditContext { field.deleteExactSubfields(subfield); - this.focusSubfield(field, sfpos, true); + this.focusSubfield(field, sfpos, 'group'); } focusTag(field: MarcField) { diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 36b6efbc2c..96cd0e668b 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -221,10 +221,11 @@ export class MarcRichEditorComponent implements OnInit { if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { return; } - // otherwise, move focus from the group to its first input (the subfield code) + // otherwise, move focus from the group to the subfield code if it's empty, or the value if not evt.preventDefault(); evt.stopPropagation(); - this.context.focusSubfield(field, subfield[2], false); + const target = subfield[0] == ' ' ? 'sfc' : 'sfv'; + this.context.focusSubfield(field, subfield[2], target); break; // all remaining shortcuts duplicated from editable-content.component.ts ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editor-context.ts | 17 +++++++---------- .../app/staff/share/marc-edit/rich-editor.component.ts | 5 +++-- 2 files changed, 10 insertions(+), 12 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 620b4ec28636e6bc615901eb3db975586983a00d
by Git User 11 Jul '25

11 Jul '25

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, main has been updated via 620b4ec28636e6bc615901eb3db975586983a00d (commit) from 2fb16362eccea81a1b4a3c4d3caeba866be161b7 (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 620b4ec28636e6bc615901eb3db975586983a00d Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Jun 6 21:02:56 2025 +0000 LP2111948 Focus on code first when adding subfield When adding a new subfield in the MARC rich editor, focus should move to the empty subfield code input first. Focus should also move to the code when pressing the right or left arrow key in a focused subfield group where the code is empty. Release-note: Focuses on subfield code input rather than value when the code is empty (as when adding a new subfield). Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Elizabeth Davis <elizabeth.davis(a)sparkpa.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index 1df38c3658..4d58bc0f66 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -249,7 +249,7 @@ export class MarcEditContext { if (action.subfield) { const prevPos = action.subfield[2] - 1; action.field.deleteExactSubfields(action.subfield); - this.focusSubfield(action.field, prevPos, true); + this.focusSubfield(action.field, prevPos, 'group'); } else { this.record.deleteFields(action.field); @@ -265,7 +265,7 @@ export class MarcEditContext { if (action.subfield) { this.insertSubfield(action.field, action.subfield, true); - this.focusSubfield(action.field, action.subfield[2]); + this.focusSubfield(action.field, action.subfield[2], 'sfv'); } else { @@ -429,7 +429,7 @@ export class MarcEditContext { field.subfields.splice(position, 0, subfield); if (!skipTracking) { - this.focusSubfield(field, position); + this.focusSubfield(field, position, 'sfc'); this.trackStructuralUndo(field, true, subfield); } } @@ -440,15 +440,12 @@ export class MarcEditContext { } // Focus the requested subfield by its position. - focusSubfield(field: MarcField, position: number, group?: boolean) { + focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | "group" | "move") { // console.debug("focusSubfield()", field, position, group); const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; - if (group) { - focus.target = 'group'; - } else if (position < 0) { - // Focus the code instead of the value - focus.target = 'sfc'; + if (target) { + focus.target = target; } focus.sfOffset = position; @@ -463,7 +460,7 @@ export class MarcEditContext { field.deleteExactSubfields(subfield); - this.focusSubfield(field, sfpos, true); + this.focusSubfield(field, sfpos, 'group'); } focusTag(field: MarcField) { diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index cc32d9d071..94b12eeb91 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -222,10 +222,11 @@ export class MarcRichEditorComponent implements OnInit { if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { return; } - // otherwise, move focus from the group to its first input (the subfield code) + // otherwise, move focus from the group to the subfield code if it's empty, or the value if not evt.preventDefault(); evt.stopPropagation(); - this.context.focusSubfield(field, subfield[2], false); + const target = subfield[0] == ' ' ? 'sfc' : 'sfv'; + this.context.focusSubfield(field, subfield[2], target); break; // all remaining shortcuts duplicated from editable-content.component.ts ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editor-context.ts | 17 +++++++---------- .../app/staff/share/marc-edit/rich-editor.component.ts | 5 +++-- 2 files changed, 10 insertions(+), 12 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. bc3f48a2347c8e9ee92faedf192ea5427e901bb6
by Git User 11 Jul '25

11 Jul '25

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_14 has been updated via bc3f48a2347c8e9ee92faedf192ea5427e901bb6 (commit) from 46c38a402cbba948c59c1b1f0b11012dcfca111e (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 bc3f48a2347c8e9ee92faedf192ea5427e901bb6 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri May 30 16:58:02 2025 +0000 LP1785697 Fix OPAC advanced filters applied count Adds 'sort','skip_check', and 'check_limit' to the list of filters that are ignored when calculating the count of filters applied in the OPAC advanced search results. Refactors the filter show/hide area to eliminate hard-coded square brackets containing a link with a click action that confused accessibility testers. Replaces this with a simple heading if only one filter is applied, or a details/summary area for more than one. Release-note: Corrects OPAC advanced filters applied count; refactors filter show/hide link as details/summary Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 index 2f6716f99b..1a253c5c72 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -603,7 +603,7 @@ a { } #search-wrapper h1, -#search-wrapper h2 { +#search-wrapper h2:not(h2.h3) { text-align: center; } @@ -980,6 +980,10 @@ for now until a better color is picked - if needed. margin-top: 0; } +.adv_filters_applied { + display: inline-flex; +} + .checkbox_col { width: 1%; [% IF rtl == 't' -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index d28701eaf5..d1bf9479bb 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -3,7 +3,7 @@ # We need to ignore some filters in our count -fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth']; +fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth','sort','skip_check','check_limit']; fcount = 0; FOR f IN ctx.query_struct.filters; IF fignore.grep('^' _ f.name _ '$').size; @@ -165,23 +165,23 @@ END; </form> [% END %] [% IF fcount > 0 %] - <div class="refine_search result_block_visible"> - <span id="filter_hits">[ <a href="#" onclick="getAdvLimits();return false;">[% l('[quant,_1,filter,filters] applied', fcount) %]</a> ]</span> - </div> - [% END %] - [% IF ctx.query_struct.filters.size > 0 %] - [% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %] - [% IF stuff %] - <h3 class="sr-only">[% l('Search Results filters') %]</h3> - <div class="d-flex justify-content-center"> - <div id="adv_filter_results_block" class="adv_filter_results_hide"> - <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="refine_search"> + [% IF fcount == 1 %] + <h2 class="h3">[% l('[_1] filter applied', fcount) %]</h2> <div class="d-inline-flex p-2"> - [% stuff %] + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] </div> - </div> - </div> + [% ELSE %] + <details id="filter_hits"> + <summary><h3>[% l('[_1] filters applied', fcount) %]</h3></summary> + <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="adv_filters_applied"> + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] + </div> + </div> + </details> [% END %] + </div> [% END %] [% IF ctx.search_summary.suggestions.one_class_multi_term %] <div class="result_block_visible refine_search" id="did_you_mean"> @@ -193,22 +193,6 @@ END; [% END %]</ul> </div> [% END %] - - <script> - function getAdvLimits() { - var AdvLimitsClass = document.getElementById('adv_filter_results_block').classList; - if (AdvLimitsClass.contains("adv_filter_results_hide")) { - AdvLimitsClass.remove("adv_filter_results_hide"); - } else { - AdvLimitsClass.add("adv_filter_results_hide"); - } - if (AdvLimitsClass.contains("adv_filter_results_show")) { - AdvLimitsClass.remove("adv_filter_results_show"); - } else { - AdvLimitsClass.add("adv_filter_results_show"); - } - } - </script>  </div> -</div> \ No newline at end of file +</div> ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/css/style.css.tt2 | 6 ++- .../templates-bootstrap/opac/parts/searchbar.tt2 | 48 ++++++++-------------- 2 files changed, 21 insertions(+), 33 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. fbd8884461dbc944b7a14c04e9aadff74f9c6e63
by Git User 11 Jul '25

11 Jul '25

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 fbd8884461dbc944b7a14c04e9aadff74f9c6e63 (commit) from a7afa416d19a5c84d66a11dd9cce6f2f630f8347 (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 fbd8884461dbc944b7a14c04e9aadff74f9c6e63 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri May 30 16:58:02 2025 +0000 LP1785697 Fix OPAC advanced filters applied count Adds 'sort','skip_check', and 'check_limit' to the list of filters that are ignored when calculating the count of filters applied in the OPAC advanced search results. Refactors the filter show/hide area to eliminate hard-coded square brackets containing a link with a click action that confused accessibility testers. Replaces this with a simple heading if only one filter is applied, or a details/summary area for more than one. Release-note: Corrects OPAC advanced filters applied count; refactors filter show/hide link as details/summary Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 index 2f6716f99b..1a253c5c72 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -603,7 +603,7 @@ a { } #search-wrapper h1, -#search-wrapper h2 { +#search-wrapper h2:not(h2.h3) { text-align: center; } @@ -980,6 +980,10 @@ for now until a better color is picked - if needed. margin-top: 0; } +.adv_filters_applied { + display: inline-flex; +} + .checkbox_col { width: 1%; [% IF rtl == 't' -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index d28701eaf5..d1bf9479bb 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -3,7 +3,7 @@ # We need to ignore some filters in our count -fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth']; +fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth','sort','skip_check','check_limit']; fcount = 0; FOR f IN ctx.query_struct.filters; IF fignore.grep('^' _ f.name _ '$').size; @@ -165,23 +165,23 @@ END; </form> [% END %] [% IF fcount > 0 %] - <div class="refine_search result_block_visible"> - <span id="filter_hits">[ <a href="#" onclick="getAdvLimits();return false;">[% l('[quant,_1,filter,filters] applied', fcount) %]</a> ]</span> - </div> - [% END %] - [% IF ctx.query_struct.filters.size > 0 %] - [% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %] - [% IF stuff %] - <h3 class="sr-only">[% l('Search Results filters') %]</h3> - <div class="d-flex justify-content-center"> - <div id="adv_filter_results_block" class="adv_filter_results_hide"> - <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="refine_search"> + [% IF fcount == 1 %] + <h2 class="h3">[% l('[_1] filter applied', fcount) %]</h2> <div class="d-inline-flex p-2"> - [% stuff %] + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] </div> - </div> - </div> + [% ELSE %] + <details id="filter_hits"> + <summary><h3>[% l('[_1] filters applied', fcount) %]</h3></summary> + <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="adv_filters_applied"> + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] + </div> + </div> + </details> [% END %] + </div> [% END %] [% IF ctx.search_summary.suggestions.one_class_multi_term %] <div class="result_block_visible refine_search" id="did_you_mean"> @@ -193,22 +193,6 @@ END; [% END %]</ul> </div> [% END %] - - <script> - function getAdvLimits() { - var AdvLimitsClass = document.getElementById('adv_filter_results_block').classList; - if (AdvLimitsClass.contains("adv_filter_results_hide")) { - AdvLimitsClass.remove("adv_filter_results_hide"); - } else { - AdvLimitsClass.add("adv_filter_results_hide"); - } - if (AdvLimitsClass.contains("adv_filter_results_show")) { - AdvLimitsClass.remove("adv_filter_results_show"); - } else { - AdvLimitsClass.add("adv_filter_results_show"); - } - } - </script>  </div> -</div> \ No newline at end of file +</div> ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/css/style.css.tt2 | 6 ++- .../templates-bootstrap/opac/parts/searchbar.tt2 | 48 ++++++++-------------- 2 files changed, 21 insertions(+), 33 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 2fb16362eccea81a1b4a3c4d3caeba866be161b7
by Git User 11 Jul '25

11 Jul '25

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, main has been updated via 2fb16362eccea81a1b4a3c4d3caeba866be161b7 (commit) from ab714375669e900d20fe15b02387a3b4ce679e79 (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 2fb16362eccea81a1b4a3c4d3caeba866be161b7 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri May 30 16:58:02 2025 +0000 LP1785697 Fix OPAC advanced filters applied count Adds 'sort','skip_check', and 'check_limit' to the list of filters that are ignored when calculating the count of filters applied in the OPAC advanced search results. Refactors the filter show/hide area to eliminate hard-coded square brackets containing a link with a click action that confused accessibility testers. Replaces this with a simple heading if only one filter is applied, or a details/summary area for more than one. Release-note: Corrects OPAC advanced filters applied count; refactors filter show/hide link as details/summary Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 index 2f6716f99b..1a253c5c72 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -603,7 +603,7 @@ a { } #search-wrapper h1, -#search-wrapper h2 { +#search-wrapper h2:not(h2.h3) { text-align: center; } @@ -980,6 +980,10 @@ for now until a better color is picked - if needed. margin-top: 0; } +.adv_filters_applied { + display: inline-flex; +} + .checkbox_col { width: 1%; [% IF rtl == 't' -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index d28701eaf5..d1bf9479bb 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -3,7 +3,7 @@ # We need to ignore some filters in our count -fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth']; +fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth','sort','skip_check','check_limit']; fcount = 0; FOR f IN ctx.query_struct.filters; IF fignore.grep('^' _ f.name _ '$').size; @@ -165,23 +165,23 @@ END; </form> [% END %] [% IF fcount > 0 %] - <div class="refine_search result_block_visible"> - <span id="filter_hits">[ <a href="#" onclick="getAdvLimits();return false;">[% l('[quant,_1,filter,filters] applied', fcount) %]</a> ]</span> - </div> - [% END %] - [% IF ctx.query_struct.filters.size > 0 %] - [% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %] - [% IF stuff %] - <h3 class="sr-only">[% l('Search Results filters') %]</h3> - <div class="d-flex justify-content-center"> - <div id="adv_filter_results_block" class="adv_filter_results_hide"> - <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="refine_search"> + [% IF fcount == 1 %] + <h2 class="h3">[% l('[_1] filter applied', fcount) %]</h2> <div class="d-inline-flex p-2"> - [% stuff %] + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] </div> - </div> - </div> + [% ELSE %] + <details id="filter_hits"> + <summary><h3>[% l('[_1] filters applied', fcount) %]</h3></summary> + <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="adv_filters_applied"> + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] + </div> + </div> + </details> [% END %] + </div> [% END %] [% IF ctx.search_summary.suggestions.one_class_multi_term %] <div class="result_block_visible refine_search" id="did_you_mean"> @@ -193,22 +193,6 @@ END; [% END %]</ul> </div> [% END %] - - <script> - function getAdvLimits() { - var AdvLimitsClass = document.getElementById('adv_filter_results_block').classList; - if (AdvLimitsClass.contains("adv_filter_results_hide")) { - AdvLimitsClass.remove("adv_filter_results_hide"); - } else { - AdvLimitsClass.add("adv_filter_results_hide"); - } - if (AdvLimitsClass.contains("adv_filter_results_show")) { - AdvLimitsClass.remove("adv_filter_results_show"); - } else { - AdvLimitsClass.add("adv_filter_results_show"); - } - } - </script>  </div> -</div> \ No newline at end of file +</div> ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/css/style.css.tt2 | 6 ++- .../templates-bootstrap/opac/parts/searchbar.tt2 | 48 ++++++++-------------- 2 files changed, 21 insertions(+), 33 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 46c38a402cbba948c59c1b1f0b11012dcfca111e
by Git User 11 Jul '25

11 Jul '25

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_14 has been updated via 46c38a402cbba948c59c1b1f0b11012dcfca111e (commit) from ae98afac9619d7631f0c30cfd08b8929f1ebb4b1 (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 46c38a402cbba948c59c1b1f0b11012dcfca111e Author: Stephanie Leary <stephanie.leary(a)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(a)equinoxoli.org> Signed-off-by: Jennifer Pringle <jennifer.pringle(a)bc.libraries.coop> Signed-off-by: Terran McCanna <tmccanna(a)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

1 0