From 8f88f658b538fcc81cea095b34221dbe34a15b78 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 9 Jul 2021 12:02:38 +0000 Subject: [PATCH] Bug 20310: (QA follow-up) Add 'Opac' to pref and description Signed-off-by: Nick Clemens --- installer/data/mysql/atomicupdate/bug_20130.perl | 8 -------- installer/data/mysql/atomicupdate/bug_20310.perl | 8 ++++++++ installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/circulation.pref | 4 ++-- opac/opac-request-article.pl | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_20130.perl create mode 100644 installer/data/mysql/atomicupdate/bug_20310.perl diff --git a/installer/data/mysql/atomicupdate/bug_20130.perl b/installer/data/mysql/atomicupdate/bug_20130.perl deleted file mode 100644 index c8e7143321..0000000000 --- a/installer/data/mysql/atomicupdate/bug_20130.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES - ('ArticleRequestsHostRedirection', '0', NULL, 'Enables redirection from child to host', 'YesNo') - }); - NewVersion( $DBversion, 20310, "Add pref ArticleRequestsHostRedirection"); -} diff --git a/installer/data/mysql/atomicupdate/bug_20310.perl b/installer/data/mysql/atomicupdate/bug_20310.perl new file mode 100644 index 0000000000..faffa8e4ba --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_20310.perl @@ -0,0 +1,8 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES + ('ArticleRequestsOpacHostRedirection', '0', NULL, 'Enables redirection from child to host when requesting article on OPAC', 'YesNo') + }); + NewVersion( $DBversion, 20310, "Add pref ArticleRequestsOpacHostRedirection"); +} diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index e240a1880e..6b66e42c14 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -56,7 +56,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('AnonSuggestions','0',NULL,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber','YesNo'), ('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for suggestion and checkout history privacy',''), ('ArticleRequests', '0', NULL, 'Enables the article request feature', 'YesNo'), -('ArticleRequestsHostRedirection', '0', NULL, 'Enables redirection from child to host', 'YesNo'), +('ArticleRequestsOpacHostRedirection', '0', NULL, 'Enables redirection from child to host when requesting articles on the Opac', 'YesNo'), ('ArticleRequestsLinkControl', 'calc', 'always|calc', 'Control display of article request link on search results', 'Choice'), ('ArticleRequestsMandatoryFields', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''yes''', 'multiple'), ('ArticleRequestsMandatoryFieldsItemOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index ebad36bfb4..3ae763c4ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -1193,11 +1193,11 @@ Circulation: 0: "Don't enable" - patrons to place article requests. - - - pref: ArticleRequestsHostRedirection + - pref: ArticleRequestsOpacHostRedirection choices: yes: Enable no: Disable - - " redirection from child to host based on MARC21 773$w when the child has no items." + - " redirection from child to host based on MARC21 773$w when the child has no items when requesting articles on the Opac." - - pref: ArticleRequestsLinkControl choices: diff --git a/opac/opac-request-article.pl b/opac/opac-request-article.pl index c869032a74..0d5be24b46 100755 --- a/opac/opac-request-article.pl +++ b/opac/opac-request-article.pl @@ -81,7 +81,7 @@ if ( $action eq 'create' ) { exit; # Should we redirect? } -elsif ( !$action && C4::Context->preference('ArticleRequestsHostRedirection') ) { +elsif ( !$action && C4::Context->preference('ArticleRequestsOpacHostRedirection') ) { # Conditions: no items, host item entry (MARC21 773) my ( $host, $pageinfo ) = $biblio->get_marc_host( { no_items => 1 } ); if ($host) { -- 2.20.1