April 2025 - Evergreen-commits - Evergreen Mailing Lists Server

[GIT] Evergreen ILS branch main updated. 7f1e4162b54a062b5f24c556a59cd1545bc6bfc7
by Git User 07 Apr '25

07 Apr '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 7f1e4162b54a062b5f24c556a59cd1545bc6bfc7 (commit) from a5b6bb92e5eaa3e4121f77d43ec1d6524ecbcae4 (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 7f1e4162b54a062b5f24c556a59cd1545bc6bfc7 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Mon Apr 7 12:54:16 2025 -0400 LP2106414 OPAC Alert Banner - restore dropped line Restores a previously dropped line in the TT2. It didn't cause an obvious breakage until you tried adding a link in the alert text, and then it would only allow the link to be opened as a right-click. Release-note: Restores dropped line of code in OPAC alert banner. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: blake <blake(a)mobiusconsortium.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 index 21bc934139..e14a03edbd 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 @@ -3,9 +3,10 @@ && ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_text') && ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_type') %] <div class="alert alert-[% ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_type') | html %] - <button type="button" class="close" data-dismiss="alert" aria-label="Close"> - <span aria-hidden="true">×</span> - </button> + alert-dismissible mb-0" role="alert"> + <button type="button" class="close" data-dismiss="alert" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> [% ctx.defang_string(ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_text')) %] </div> [%- END -%] ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 4f2554f3db7bdd2d30e4a6380b7fa5edf28acd9f
by Git User 07 Apr '25

07 Apr '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 4f2554f3db7bdd2d30e4a6380b7fa5edf28acd9f (commit) from 6afec604bc8cf2a0695c74f0396fc966ad562f92 (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 4f2554f3db7bdd2d30e4a6380b7fa5edf28acd9f Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Mon Apr 7 12:54:16 2025 -0400 LP2106414 OPAC Alert Banner - restore dropped line Restores a previously dropped line in the TT2. It didn't cause an obvious breakage until you tried adding a link in the alert text, and then it would only allow the link to be opened as a right-click. Release-note: Restores dropped line of code in OPAC alert banner. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: blake <blake(a)mobiusconsortium.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 index 21bc934139..e14a03edbd 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 @@ -3,9 +3,10 @@ && ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_text') && ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_type') %] <div class="alert alert-[% ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_type') | html %] - <button type="button" class="close" data-dismiss="alert" aria-label="Close"> - <span aria-hidden="true">×</span> - </button> + alert-dismissible mb-0" role="alert"> + <button type="button" class="close" data-dismiss="alert" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> [% ctx.defang_string(ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_text')) %] </div> [%- END -%] ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 6afec604bc8cf2a0695c74f0396fc966ad562f92
by Git User 07 Apr '25

07 Apr '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 6afec604bc8cf2a0695c74f0396fc966ad562f92 (commit) from 20371e6f70f4e675f5f6b6e6644c013f7adc234e (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 6afec604bc8cf2a0695c74f0396fc966ad562f92 Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Wed Apr 2 15:17:18 2025 +0000 LP#2093840 Combobox says null when empty Instead of clearing the combobox when receiving an object with an id property of null in its writeValue method, since 893a5c5 it attempts to create a freetext entry, resulting in a freetext entry of null. This rewrites the writeValue method to explicitly ensure: - only support an entry with a defined id - support a freetext entry and update an existing entry - otherwise, run the selectedId logic to select an entry or clear on null - removes the logic to select an entry on matching labels (match on ID only) Release-note: Fixes an issue where freetext null displays in comboboxes. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Carol Witt <wittc(a)cwmars.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts index 5805ccfe5a..0c338abcc4 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts @@ -397,12 +397,7 @@ implements ControlValueAccessor, OnInit, AfterViewInit, OnChanges { acc[cur.egIdlClass] = cur.template; return acc; }, {}); - - // Make the default an entry with no id if we have it - usually from reloading after saving a freetext - if (!this.selectedId && !this.selected){ - this.selected = this.entrylist.find(e => e.id == null); - } - + document.querySelectorAll('ngb-typeahead-window button[disabled]').forEach(b => b.setAttribute('tabindex', '-1')); this.controller = this.instance['_elementRef'].nativeElement as HTMLInputElement; this.controller.addEventListener('keydown', this.onKeydown.bind(this)); @@ -812,27 +807,21 @@ implements ControlValueAccessor, OnInit, AfterViewInit, OnChanges { }; writeValue(value: ComboboxEntry) { - //console.debug('writeValue: ', value); - if (value !== undefined && value !== null) { - if (!this.hasEntry(value.id)) { - // First we see if we have a different entry with the same text. - let dupeEntry = this.entrylist.find(e => e.label === value.label); - if (dupeEntry !== undefined) { - // Duplicate, select the preexisting entry - this.selected = dupeEntry; - - } else { - // No duplicate, make a new freetext entry with the same value - this.selected = - { - id: null, - label: value?.label, - freetext: true, - class: value?.class - }; - } - - } else {this.selectedId = value.id;} + // only support a ComboboxEntry + if (value?.id === undefined) { return; } + + // support a freetext entry + if (value.id === null && value.freetext && this.allowFreeText) { + const existingFreetext = this.entrylist.find( + ({ id, freetext }) => id === null && freetext + ); + if (existingFreetext) { + Object.assign(existingFreetext, value); + } + this.selected = { ...value }; + + } else { + this.selectedId = value.id; this.applySelection(); } } ----------------------------------------------------------------------- Summary of changes: .../src/app/share/combobox/combobox.component.ts | 43 ++++++++-------------- 1 file changed, 16 insertions(+), 27 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. a5b6bb92e5eaa3e4121f77d43ec1d6524ecbcae4
by Git User 07 Apr '25

07 Apr '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 a5b6bb92e5eaa3e4121f77d43ec1d6524ecbcae4 (commit) from 406f06b5a3f2cf0743c389c253f6126ee532f47e (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 a5b6bb92e5eaa3e4121f77d43ec1d6524ecbcae4 Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Wed Apr 2 15:17:18 2025 +0000 LP#2093840 Combobox says null when empty Instead of clearing the combobox when receiving an object with an id property of null in its writeValue method, since 893a5c5 it attempts to create a freetext entry, resulting in a freetext entry of null. This rewrites the writeValue method to explicitly ensure: - only support an entry with a defined id - support a freetext entry and update an existing entry - otherwise, run the selectedId logic to select an entry or clear on null - removes the logic to select an entry on matching labels (match on ID only) Release-note: Fixes an issue where freetext null displays in comboboxes. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Carol Witt <wittc(a)cwmars.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts index 5805ccfe5a..0c338abcc4 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts @@ -397,12 +397,7 @@ implements ControlValueAccessor, OnInit, AfterViewInit, OnChanges { acc[cur.egIdlClass] = cur.template; return acc; }, {}); - - // Make the default an entry with no id if we have it - usually from reloading after saving a freetext - if (!this.selectedId && !this.selected){ - this.selected = this.entrylist.find(e => e.id == null); - } - + document.querySelectorAll('ngb-typeahead-window button[disabled]').forEach(b => b.setAttribute('tabindex', '-1')); this.controller = this.instance['_elementRef'].nativeElement as HTMLInputElement; this.controller.addEventListener('keydown', this.onKeydown.bind(this)); @@ -812,27 +807,21 @@ implements ControlValueAccessor, OnInit, AfterViewInit, OnChanges { }; writeValue(value: ComboboxEntry) { - //console.debug('writeValue: ', value); - if (value !== undefined && value !== null) { - if (!this.hasEntry(value.id)) { - // First we see if we have a different entry with the same text. - let dupeEntry = this.entrylist.find(e => e.label === value.label); - if (dupeEntry !== undefined) { - // Duplicate, select the preexisting entry - this.selected = dupeEntry; - - } else { - // No duplicate, make a new freetext entry with the same value - this.selected = - { - id: null, - label: value?.label, - freetext: true, - class: value?.class - }; - } - - } else {this.selectedId = value.id;} + // only support a ComboboxEntry + if (value?.id === undefined) { return; } + + // support a freetext entry + if (value.id === null && value.freetext && this.allowFreeText) { + const existingFreetext = this.entrylist.find( + ({ id, freetext }) => id === null && freetext + ); + if (existingFreetext) { + Object.assign(existingFreetext, value); + } + this.selected = { ...value }; + + } else { + this.selectedId = value.id; this.applySelection(); } } ----------------------------------------------------------------------- Summary of changes: .../src/app/share/combobox/combobox.component.ts | 43 ++++++++-------------- 1 file changed, 16 insertions(+), 27 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 151af92f97177f3d92ecf7d118b2f28d04767de3
by Git User 07 Apr '25

07 Apr '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 151af92f97177f3d92ecf7d118b2f28d04767de3 (commit) from 1896e5cbe45a3da2f154e49ed4f06233a9e1977c (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 151af92f97177f3d92ecf7d118b2f28d04767de3 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Thu Apr 3 21:23:51 2025 +0000 LP2098712 Open lead record after merge from bucket Opens the lead record in a new tab after records have been merged from the Angular record bucket grid actions. Release-note: Opens the lead record after merging records from a bucket Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Tara Kunesh <tkunesh(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js index 1b56d5dd09..74deba14f9 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js @@ -760,7 +760,7 @@ function($scope, $q , $routeParams, bucketSvc, egCore, $window, ).then(function() { if (bChannel) { bChannel.postMessage({success:true}); - // $window.open('/eg2/staff/catalog/record/' + args.lead_id); + $window.open('/eg2/staff/catalog/record/' + args.lead_id, '_blank'); $window.close(); // called from the Angular bucket UI } }); ----------------------------------------------------------------------- Summary of changes: Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 20371e6f70f4e675f5f6b6e6644c013f7adc234e
by Git User 07 Apr '25

07 Apr '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 20371e6f70f4e675f5f6b6e6644c013f7adc234e (commit) from 9999d68a37fc6e66e2b8a6119ed4dc68c1ba918b (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 20371e6f70f4e675f5f6b6e6644c013f7adc234e Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Thu Apr 3 21:23:51 2025 +0000 LP2098712 Open lead record after merge from bucket Opens the lead record in a new tab after records have been merged from the Angular record bucket grid actions. Release-note: Opens the lead record after merging records from a bucket Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Tara Kunesh <tkunesh(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js index 1b56d5dd09..74deba14f9 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js @@ -760,7 +760,7 @@ function($scope, $q , $routeParams, bucketSvc, egCore, $window, ).then(function() { if (bChannel) { bChannel.postMessage({success:true}); - // $window.open('/eg2/staff/catalog/record/' + args.lead_id); + $window.open('/eg2/staff/catalog/record/' + args.lead_id, '_blank'); $window.close(); // called from the Angular bucket UI } }); ----------------------------------------------------------------------- Summary of changes: Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 406f06b5a3f2cf0743c389c253f6126ee532f47e
by Git User 07 Apr '25

07 Apr '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 406f06b5a3f2cf0743c389c253f6126ee532f47e (commit) from a5df968f42b35778c20d2c09296144f3fb81d8e8 (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 406f06b5a3f2cf0743c389c253f6126ee532f47e Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Thu Apr 3 21:23:51 2025 +0000 LP2098712 Open lead record after merge from bucket Opens the lead record in a new tab after records have been merged from the Angular record bucket grid actions. Release-note: Opens the lead record after merging records from a bucket Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Tara Kunesh <tkunesh(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js index 1b56d5dd09..74deba14f9 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js @@ -760,7 +760,7 @@ function($scope, $q , $routeParams, bucketSvc, egCore, $window, ).then(function() { if (bChannel) { bChannel.postMessage({success:true}); - // $window.open('/eg2/staff/catalog/record/' + args.lead_id); + $window.open('/eg2/staff/catalog/record/' + args.lead_id, '_blank'); $window.close(); // called from the Angular bucket UI } }); ----------------------------------------------------------------------- Summary of changes: Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. 86114db90d24613c073ed0c28d31da2020d3cc0b
by Git User 07 Apr '25

07 Apr '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_13 has been updated via 86114db90d24613c073ed0c28d31da2020d3cc0b (commit) from 8bc7e83744a57e55322e01bc9d2ff2cede2739f8 (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 86114db90d24613c073ed0c28d31da2020d3cc0b Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 22:27:21 2025 +0000 LP2095532 Ctrl+arrow creates only one new MARC row In the MARC rich editor, call preventDefault() and stopPropagation() on keydown handlers when pressing Control + the up or down arrow to avoid creating duplicate copies of the current row (due to similar handlers in both the editable content and rich editor components). See also bug 2084199 for related keyboard operation errors prior to 3.13.6 and 3.14.1. Release-note: Prevents duplicate new MARC rows using Control + Arrow key Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Carol Witt <wittc(a)cwmars.org> Signed-off-by: Terran McCanna <tmccanna(a)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 d6ebca0dbb..8234b2d279 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 @@ -564,6 +564,8 @@ implements OnInit, AfterViewInit, OnDestroy { if (evt.ctrlKey && !evt.shiftKey && !(this.fieldType === 'ldr' || this.fieldType === 'ffld')) { // ctrl+down == copy current field down one + evt.preventDefault(); + evt.stopPropagation(); this.context.insertField( this.field, this.record.cloneField(this.field)); } @@ -587,6 +589,8 @@ implements OnInit, AfterViewInit, OnDestroy { if (evt.ctrlKey && !evt.shiftKey && !(this.fieldType === 'ldr' || this.fieldType === 'ffld')) { // ctrl+up == copy current field up one + evt.preventDefault(); + evt.stopPropagation(); this.context.insertField( this.field, this.record.cloneField(this.field), true); } ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editable-content.component.ts | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 1896e5cbe45a3da2f154e49ed4f06233a9e1977c
by Git User 07 Apr '25

07 Apr '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 1896e5cbe45a3da2f154e49ed4f06233a9e1977c (commit) from 0069ca2d6bd91a15ddf52ce6b4dd936e5d7d414b (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 1896e5cbe45a3da2f154e49ed4f06233a9e1977c Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 22:27:21 2025 +0000 LP2095532 Ctrl+arrow creates only one new MARC row In the MARC rich editor, call preventDefault() and stopPropagation() on keydown handlers when pressing Control + the up or down arrow to avoid creating duplicate copies of the current row (due to similar handlers in both the editable content and rich editor components). See also bug 2084199 for related keyboard operation errors prior to 3.13.6 and 3.14.1. Release-note: Prevents duplicate new MARC rows using Control + Arrow key Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Carol Witt <wittc(a)cwmars.org> Signed-off-by: Terran McCanna <tmccanna(a)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 d6ebca0dbb..8234b2d279 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 @@ -564,6 +564,8 @@ implements OnInit, AfterViewInit, OnDestroy { if (evt.ctrlKey && !evt.shiftKey && !(this.fieldType === 'ldr' || this.fieldType === 'ffld')) { // ctrl+down == copy current field down one + evt.preventDefault(); + evt.stopPropagation(); this.context.insertField( this.field, this.record.cloneField(this.field)); } @@ -587,6 +589,8 @@ implements OnInit, AfterViewInit, OnDestroy { if (evt.ctrlKey && !evt.shiftKey && !(this.fieldType === 'ldr' || this.fieldType === 'ffld')) { // ctrl+up == copy current field up one + evt.preventDefault(); + evt.stopPropagation(); this.context.insertField( this.field, this.record.cloneField(this.field), true); } ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editable-content.component.ts | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 9999d68a37fc6e66e2b8a6119ed4dc68c1ba918b
by Git User 07 Apr '25

07 Apr '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 9999d68a37fc6e66e2b8a6119ed4dc68c1ba918b (commit) from 30865c0e32c02efc5515a6cf1ecea83c456b5ed5 (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 9999d68a37fc6e66e2b8a6119ed4dc68c1ba918b Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 22:27:21 2025 +0000 LP2095532 Ctrl+arrow creates only one new MARC row In the MARC rich editor, call preventDefault() and stopPropagation() on keydown handlers when pressing Control + the up or down arrow to avoid creating duplicate copies of the current row (due to similar handlers in both the editable content and rich editor components). See also bug 2084199 for related keyboard operation errors prior to 3.13.6 and 3.14.1. Release-note: Prevents duplicate new MARC rows using Control + Arrow key Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Carol Witt <wittc(a)cwmars.org> Signed-off-by: Terran McCanna <tmccanna(a)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 d6ebca0dbb..8234b2d279 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 @@ -564,6 +564,8 @@ implements OnInit, AfterViewInit, OnDestroy { if (evt.ctrlKey && !evt.shiftKey && !(this.fieldType === 'ldr' || this.fieldType === 'ffld')) { // ctrl+down == copy current field down one + evt.preventDefault(); + evt.stopPropagation(); this.context.insertField( this.field, this.record.cloneField(this.field)); } @@ -587,6 +589,8 @@ implements OnInit, AfterViewInit, OnDestroy { if (evt.ctrlKey && !evt.shiftKey && !(this.fieldType === 'ldr' || this.fieldType === 'ffld')) { // ctrl+up == copy current field up one + evt.preventDefault(); + evt.stopPropagation(); this.context.insertField( this.field, this.record.cloneField(this.field), true); } ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editable-content.component.ts | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- Evergreen ILS

1 0