Bugzilla – Attachment 181188 Details for
Bug 39294
Not all settings stick when staging MARC records for import
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39294: [24.11.x] Fix includes to properly remember selections
Bug-39294-2411x-Fix-includes-to-properly-remember-.patch (text/plain), 9.96 KB, created by
Lucas Gass (lukeg)
on 2025-04-18 15:48:34 UTC
(
hide
)
Description:
Bug 39294: [24.11.x] Fix includes to properly remember selections
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2025-04-18 15:48:34 UTC
Size:
9.96 KB
patch
obsolete
>From c0647783f533685fea80357068782145acad913b Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >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 > <input type ="hidden" name="item_action" value="ignore"> > [% ELSE %] >@@ -7,31 +7,31 @@ > [% ELSE %] > <select name="item_action" id="item_action"> > [% END %] >- [% IF ( account.item_action == 'always_add' ) %] >+ [% IF ( action == 'always_add' ) %] > <option value="always_add" selected="selected"> > [% ELSE %] > <option value="always_add"> > [% END %] > Always add items</option> >- [% IF ( account.item_action == 'add_only_for_matches' ) %] >+ [% IF ( action == 'add_only_for_matches' ) %] > <option value="add_only_for_matches" selected="selected"> > [% ELSE %] > <option value="add_only_for_matches"> > [% END %] > Add items only if matching bib was found</option> >- [% IF ( account.item_action == 'add_only_for_new' ) %] >+ [% IF ( action == 'add_only_for_new' ) %] > <option value="add_only_for_new" selected="selected"> > [% ELSE %] > <option value="add_only_for_new"> > [% END %] > Add items only if no matching bib was found</option> >- [% IF ( account.item_action == 'replace' ) %] >+ [% IF ( action == 'replace' ) %] > <option value="replace" selected="selected"> > [% ELSE %] > <option value="replace"> > [% END %] > Replace items if matching bib was found (only for existing items)</option> >- [% IF ( account.item_action == 'ignore' ) %] >+ [% IF ( action == 'ignore' ) %] > <option value="ignore" selected="selected"> > [% ELSE %] > <option value="ignore"> >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 4476bbb7f59..3f94200c09d 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 >@@ -3,13 +3,13 @@ > [% ELSE %] > <select name="nomatch_action" id="nomatch_action"> > [% END %] >- [% IF ( account.nomatch_action == 'create_new' ) %] >+ [% IF ( action == 'create_new' ) %] > <option value="create_new" selected="selected"> > [% ELSE %] > <option value="create_new"> > [% END %] > Add incoming record</option> >- [% IF ( account.nomatch_action == 'ignore' ) %] >+ [% IF ( action == 'ignore' ) %] > <option value="ignore" selected="selected"> > [% ELSE %] > <option value="ignore"> >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 26cfca09869..e906b4e6625 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 >@@ -3,19 +3,19 @@ > [% ELSE %] > <select name="overlay_action" id="overlay_action"> > [% END %] >- [% IF ( account.overlay_action == 'replace' ) %] >+ [% IF ( action == 'replace' ) %] > <option value="replace" selected="selected"> > [% ELSE %] > <option value="replace"> > [% END %] > Replace existing record with incoming record</option> >- [% IF ( account.overlay_action == 'create_new' ) %] >+ [% IF ( action == 'create_new' ) %] > <option value="create_new" selected="selected"> > [% ELSE %] > <option value="create_new"> > [% END %] > Add incoming record</option> >- [% IF ( account.overlay_action == 'ignore' ) %] >+ [% IF ( action == 'ignore' ) %] > <option value="ignore" selected="selected"> > [% ELSE %] > <option value="ignore"> >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 4759d6aec21..ebbc6818090 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 >@@ -219,11 +219,11 @@ MARC order accounts > </li> > <li> > <label for="overlay_action">Action if matching record found: </label> >- [% INCLUDE 'tools-overlay-action.inc' class_name='select2' %] >+ [% INCLUDE 'tools-overlay-action.inc' action=account.overlay_action class_name='select2' %] > </li> > <li> > <label for="nomatch_action">Action if no match is found: </label> >- [% INCLUDE 'tools-nomatch-action.inc' class_name='select2' %] >+ [% INCLUDE 'tools-nomatch-action.inc' action=account.nomatch_action class_name='select2' %] > </li> > </ol> > </fieldset> >@@ -250,7 +250,7 @@ MARC order accounts > <ol> > <li> > <label for="item_action">How to process items: </label> >- [% INCLUDE 'tools-item-action.inc' class_name='select2' %] >+ [% INCLUDE 'tools-item-action.inc' action=account.item_action class_name='select2' %] > </li> > </ol> > </fieldset> >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 9ab8d7c9f89..cb14c798978 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 >@@ -209,7 +209,7 @@ > <li> > [% IF ( can_commit ) %] > <label for="overlay_action">Action if matching record found:</label> >- [% INCLUDE 'tools-overlay-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a></span> >+ [% INCLUDE 'tools-overlay-action.inc' action=overlay_action %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a></span> > [% ELSE %] > <span class="label">Action if matching record found:</span> > [% IF ( overlay_action == 'replace' ) %] >@@ -226,7 +226,7 @@ > <li> > [% IF ( can_commit ) %] > <label for="nomatch_action">Action if no match found:</label> >- [% INCLUDE 'tools-nomatch-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a></span> >+ [% INCLUDE 'tools-nomatch-action.inc' action=nomatch_action %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a></span> > [% ELSE %] > <span class="label">Action if no match found:</span> > [% IF ( nomatch_action == 'create_new' ) %] >@@ -242,7 +242,7 @@ > <li> > [% IF ( can_commit ) %] > <label for="item_action">Item processing:</label> >- [% INCLUDE 'tools-item-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_item_action">Reset</a></span> >+ [% INCLUDE 'tools-item-action.inc' action=item_action %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_item_action">Reset</a></span> > [% ELSE %] > <span class="label">Item processing:</span> > [% IF ( item_action == 'always_add' ) %] >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 39294
:
179131
|
179172
|
180029
| 181188