Bugzilla – Attachment 179131 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: Fix includes to properly remember selections
Bug-39294-Fix-includes-to-properly-remember-select.patch (text/plain), 9.29 KB, created by
Lucas Gass (lukeg)
on 2025-03-10 22:31:31 UTC
(
hide
)
Description:
Bug 39294: Fix includes to properly remember selections
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2025-03-10 22:31:31 UTC
Size:
9.29 KB
patch
obsolete
>From e74cf26069bdf3c04e5c7468b611696f2908ac5f Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >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 > <input type="hidden" name="item_action" value="ignore" /> > [% ELSE %] > <select name="item_action" id="item_action" class="[% class_name | html %]"> >- <option value="always_add" [% IF account.item_action == 'always_add' %]selected="selected"[% END %]> Always add items</option> >- <option value="add_only_for_matches" [% IF account.item_action == 'add_only_for_matches' %]selected="selected"[% END %]> Add items only if matching bib was found</option> >- <option value="add_only_for_new" [% IF account.item_action == 'add_only_for_new' %]selected="selected"[% END %]> Add items only if no matching bib was found</option> >- <option value="replace" [% IF account.item_action == 'replace' %]selected="selected"[% END %]> Replace items if matching bib was found (only for existing items)</option> >- <option value="ignore" [% IF account.item_action == 'ignore' %]selected="selected"[% END %]> Ignore items</option> >+ <option value="always_add" [% IF action == 'always_add' %]selected="selected"[% END %]> Always add items</option> >+ <option value="add_only_for_matches" [% IF action == 'add_only_for_matches' %]selected="selected"[% END %]> Add items only if matching bib was found</option> >+ <option value="add_only_for_new" [% IF action == 'add_only_for_new' %]selected="selected"[% END %]> Add items only if no matching bib was found</option> >+ <option value="replace" [% IF action == 'replace' %]selected="selected"[% END %]> Replace items if matching bib was found (only for existing items)</option> >+ <option value="ignore" [% IF action == 'ignore' %]selected="selected"[% END %]> Ignore items</option> > </select> > [% 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 @@ > <select name="nomatch_action" id="nomatch_action" class="[% class_name | html %]"> >- <option value="create_new" [% IF account.nomatch_action == 'create_new' %]selected="selected"[% END %]> Add incoming record</option> >- <option value="ignore" [% IF account.nomatch_action == 'ignore' %]selected="selected"[% END %]> Ignore incoming record</option> >+ <option value="create_new" [% IF action == 'create_new' %]selected="selected"[% END %]> Add incoming record</option> >+ <option value="ignore" [% IF action == 'ignore' %]selected="selected"[% END %]> Ignore incoming record</option> > </select> >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 @@ > <select name="overlay_action" id="overlay_action" class="[% class_name | html %]"> >- <option value="replace" [% IF account.overlay_action == 'replace' %]selected="selected"[% END %]> Replace existing record with incoming record</option> >- <option value="create_new" [% IF account.overlay_action == 'create_new' %]selected="selected"[% END %]> Add incoming record</option> >- <option value="ignore" [% IF account.overlay_action == 'ignore' %]selected="selected"[% END %]> Ignore incoming record (its items may still be processed)</option> >+ <option value="replace" [% IF action == 'replace' %]selected="selected"[% END %]> Replace existing record with incoming record</option> >+ <option value="create_new" [% IF action == 'create_new' %]selected="selected"[% END %]> Add incoming record</option> >+ <option value="ignore" [% IF action == 'ignore' %]selected="selected"[% END %]> Ignore incoming record (its items may still be processed)</option> > </select> >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 @@ > </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> >@@ -239,7 +239,7 @@ > <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 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 @@ > </li> > <li> > <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> > </li> > <li> > <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> > </li> > [% IF ( record_type == 'biblio' ) %] > <li> > <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> > </li> > [% ELSE %] > <input type="hidden" name="item_action" value="ignore" /> >-- >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