Attachment 123137 Details for Bug 18138 – Bug 18138: (follow-up) Adjust the system preference editor to allow choosing a modification template

[patch] Bug 18138: (follow-up) Adjust the system preference editor to allow choosing a modification template

Bug-18138-follow-up-Adjust-the-system-preference-e.patch (text/plain), 5.06 KB, created by David Gustafsson on 2021-07-23 14:57:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Gustafsson

Created: 2021-07-23 14:57:47 UTC

Size: 5.06 KB

patch

obsolete

>From 5558ce5deb6c7992a771ad3ed780471807f487e1 Mon Sep 17 00:00:00 2001
>From: David Gustafsson <glasklas@gmail.com>
>Date: Fri, 23 Jul 2021 16:37:22 +0200
>Subject: [PATCH] Bug 18138: (follow-up) Adjust the system preference editor to
> allow choosing a modification template
>
>Rather than expecting the librarian to add an ID or a name we should provide a dropdown
>
>To test:
>1 - Apply all patches
>2 - Search for sytem preference 'SaveBiblioMarcModificationTemplate'
>3 - Note it list all defined Marc modification templates
>4 - Select one
>5 - confirm value in DB is the template id
>
>Works fine for me
>
>Signed-off-by: Frank Hansen <frank.hansen@ub.lu.se>
>---
> admin/preferences.pl                                          | 4 ++++
> ...g_18138-edit-biblio-marc-modification-template-syspref.sql | 2 +-
> installer/data/mysql/mandatory/sysprefs.sql                   | 2 +-
> .../prog/en/modules/admin/preferences/cataloguing.pref        | 2 +-
> 4 files changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/admin/preferences.pl b/admin/preferences.pl
>index 49d06ad996..5997b04f19 100755
>--- a/admin/preferences.pl
>+++ b/admin/preferences.pl
>@@ -28,6 +28,7 @@ use C4::ClassSource qw( GetClassSources GetClassSource );
> use C4::Output qw( output_html_with_http_headers );
> use C4::Templates;
> use Koha::Acquisition::Currencies;
>+use Koha::MarcModificationTemplates;
> use IO::File;
> use YAML::XS;
> use Encode;
>@@ -103,6 +104,9 @@ sub _get_chunk {
>             } elsif ( $options{choices} eq 'patron-categories' ) {
>                 $options{choices} = { map { $_->categorycode => $_->description } Koha::Patron::Categories->search };
>                 $add_blank = 1;
>+            } elsif ( $options{choices} eq 'modification-templates' ) {
>+                $options{choices} = { map { $_->template_id => $_->name } Koha::MarcModificationTemplates->search };
>+                $add_blank = 1;
>             } else {
>                 die 'Unrecognized source of preference values: ' . $options{'choices'};
>             }
>diff --git a/installer/data/mysql/atomicupdate/bug_18138-edit-biblio-marc-modification-template-syspref.sql b/installer/data/mysql/atomicupdate/bug_18138-edit-biblio-marc-modification-template-syspref.sql
>index 07bf6fce9a..e9b564a55a 100644
>--- a/installer/data/mysql/atomicupdate/bug_18138-edit-biblio-marc-modification-template-syspref.sql
>+++ b/installer/data/mysql/atomicupdate/bug_18138-edit-biblio-marc-modification-template-syspref.sql
>@@ -1 +1 @@
>-INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type`) VALUES ('SaveBiblioMarcModificationTemplate', '', NULL, 'MARC modification template applied when saving bibliographic record in staff client or HTTP API', 'Free');
>+INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type`) VALUES ('SaveBiblioMarcModificationTemplate', '', NULL, 'MARC modification template applied when saving bibliographic record in staff client or HTTP API', 'modification-templates');
>diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
>index dd1756e836..0d142bf501 100644
>--- a/installer/data/mysql/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/mandatory/sysprefs.sql
>@@ -585,7 +585,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('RoutingListAddReserves','0','','If ON the patrons on routing lists are automatically added to holds on the issue.','YesNo'),
> ('RoutingListNote','To change this note edit <a href=\"/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped\">RoutingListNote</a> system preference.','70|10','Define a note to be shown on all routing lists','Textarea'),
> ('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'),
>-('SaveBiblioMarcModificationTemplate', '', NULL, 'MARC modification template applied when saving bibliographic record in staff client or HTTP API', 'Free'),
>+('SaveBiblioMarcModificationTemplate', '', NULL, 'MARC modification template applied when saving bibliographic record in staff client or HTTP API', 'modification-templates'),
> ('SCOAllowCheckin','0','','If enabled, patrons may return items through the Web-based Self Checkout','YesNo'),
> ('SCOMainUserBlock','','70|10','Add a block of HTML that will display on the self checkout screen','Textarea'),
> ('SCOUserCSS','',NULL,'Add CSS to be included in the SCO module in an embedded <style> tag.','free'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
>index 550bf5569f..6b4975683c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
>@@ -161,7 +161,7 @@ Cataloging:
>         -
>             - Apply the MARC modification template with name
>             - pref: SaveBiblioMarcModificationTemplate
>-              class: short
>+              class: modification-templates
>             - on records saved using the staff client simple MARC editor, advanced editor or HTTP API.
>     Display:
>         -
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 18138: 61442 | 61443 | 61734 | 82783 | 86617 | 110266 | 110269 | 110270 | 110272 | 118439 | 118440 | 118441 | 118442 | 118443 | 118444 | 118824 | 120709 | 123125 | 123127 | 123128 | 123129 | 123130 | 123131 | 123132 | 123133 | 123137 | 124466 | 124467 | 124468 | 124469 | 124470 | 124471 | 124472 | 124473 | 124474 | 124475 | 124476 | 124477 | 124478 | 124484 | 124485 | 124486 | 124492 | 124493 | 124991 | 125157 | 148004 | 148005 | 148006 | 148007 | 148008 | 148009 | 157183 | 157184 | 157185 | 157186 | 157187 | 157188 | 157189 | 157190 | 157485 | 157486 | 157487 | 157488 | 157489 | 157490 | 157491 | 158414 | 158415 | 158416 | 158417 | 158418 | 158419 | 158420 | 158421 | 162612 | 162613