From c0647783f533685fea80357068782145acad913b Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Fri, 18 Apr 2025 15:47:20 +0000 Subject: [PATCH] Bug 39294: [24.11.x] Fix includes to properly remember selections To test: 1. Cataloging > Stage MARC record for import 2. Upload a MARC file 3. Change some of the following settings: -Action if matching record found: -Action if no match is found: -How to process items/Item processing: 4. Stage for import and View batch 5. None of this settings have been retained. 6. APPLY PATCH 7. Try these steps again, now the settings should be remembered 8. Turn on the 'MarcOrderingAutomation' system preference. 9. Administration > MARC order accounts 10. Create a new account 11. Change the "Record matching settings" and submit 12. Make sure every selection is remembered when you edit the account. --- .../prog/en/includes/tools-item-action.inc | 12 ++++++------ .../prog/en/includes/tools-nomatch-action.inc | 4 ++-- .../prog/en/includes/tools-overlay-action.inc | 6 +++--- .../prog/en/modules/admin/marc_order_accounts.tt | 6 +++--- .../prog/en/modules/tools/manage-marc-import.tt | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc index 6007b5e8267..d1e5e8898cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc @@ -1,4 +1,4 @@ -[% IF account.item_action == 'ignore' AND num_items == 0 %] +[% IF action == 'ignore' AND num_items == 0 %] No items were found during staging [% ELSE %] @@ -7,31 +7,31 @@ [% ELSE %] [% END %] - [% IF ( account.nomatch_action == 'create_new' ) %] + [% IF ( action == 'create_new' ) %] - [% IF ( account.nomatch_action == 'ignore' ) %] + [% IF ( action == 'ignore' ) %]