From e74cf26069bdf3c04e5c7468b611696f2908ac5f Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 10 Mar 2025 22:24:49 +0000 Subject: [PATCH] Bug 39294: 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 0e1cc82b878..e2dde2a6703 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,12 +1,12 @@ -[% IF account.item_action == 'ignore' AND num_items == 0 %] +[% IF action == 'ignore' AND num_items == 0 %] No items were found during staging [% ELSE %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-nomatch-action.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-nomatch-action.inc index 6e1c839da64..a46855baee3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-nomatch-action.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-nomatch-action.inc @@ -1,4 +1,4 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-overlay-action.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-overlay-action.inc index 0e05fe442c7..4e9d5156d3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-overlay-action.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-overlay-action.inc @@ -1,5 +1,5 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt index 99174f9cfb3..c4419c8d3b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt @@ -208,11 +208,11 @@
  • - [% INCLUDE 'tools-overlay-action.inc' class_name='select2' %] + [% INCLUDE 'tools-overlay-action.inc' action=account.overlay_action class_name='select2' %]
  • - [% INCLUDE 'tools-nomatch-action.inc' class_name='select2' %] + [% INCLUDE 'tools-nomatch-action.inc' action=account.nomatch_action class_name='select2' %]
  • @@ -239,7 +239,7 @@
    1. - [% INCLUDE 'tools-item-action.inc' class_name='select2' %] + [% INCLUDE 'tools-item-action.inc' action=account.item_action class_name='select2' %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt index e78408d57d9..f08a2593d16 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -204,16 +204,16 @@
  • - [% INCLUDE 'tools-overlay-action.inc' %] Changed. Reset + [% INCLUDE 'tools-overlay-action.inc' action=overlay_action %] Changed. Reset
  • - [% INCLUDE 'tools-nomatch-action.inc' %] Changed. Reset + [% INCLUDE 'tools-nomatch-action.inc' action=nomatch_action %] Changed. Reset
  • [% IF ( record_type == 'biblio' ) %]
  • - [% INCLUDE 'tools-item-action.inc' %] Changed. Reset + [% INCLUDE 'tools-item-action.inc' action=item_action %] Changed. Reset
  • [% ELSE %] -- 2.39.5