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 0435f2f52a62aacac7476aaebb705938148a8035 (commit) from 81a6cc2680e30f3a11e0ac390a1881c2d2ba0e5b (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 0435f2f52a62aacac7476aaebb705938148a8035 Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Wed Mar 12 00:42:13 2025 +0000 LP2084929 Undo/redo for MARC fixed and LDR fields Fixes an error that was preventing the undo and redo actions from completing in the MARC rich editor's fixed fields and LDR. Release-note: Fixes undo/redo in MARC rich editor fixed fields and LDR. Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall@dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts index 9c058f74d5..c27363d790 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts @@ -153,8 +153,10 @@ implements OnInit, AfterViewInit, OnDestroy { } selectText(req?: FieldFocusRequest) { - this.field.hasFocus = true; - this.field.isDraggable = false; + if (this.field && typeof this.field == 'object') { + this.field.hasFocus = true; + this.field.isDraggable = false; + } if (!this.bigText) { this.editInput?.select(); 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 136dc02cb3..cfce36f413 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 @@ -301,7 +301,7 @@ export class MarcEditContext { } trackMoveUndo(field: MarcField, prevIndex: number) { - const position: FieldFocusRequest = {fieldId: field.fieldId, target: 'move'}; + const position: FieldFocusRequest = {fieldId: field?.fieldId, target: 'move'}; const action = new StructUndoRedoAction(); action.field = field; ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editable-content.component.ts | 6 ++++-- Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS