Bugzilla – Attachment 122732 Details for
Bug 20310
Article requests: Use details from the host record when submitting an article request on an analytic record without attached items
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20310: (QA follow-up) Add 'Opac' to pref and description
Bug-20310-QA-follow-up-Add-Opac-to-pref-and-descri.patch (text/plain), 5.04 KB, created by
Nick Clemens (kidclamp)
on 2021-07-09 12:04:20 UTC
(
hide
)
Description:
Bug 20310: (QA follow-up) Add 'Opac' to pref and description
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2021-07-09 12:04:20 UTC
Size:
5.04 KB
patch
obsolete
>From 8f88f658b538fcc81cea095b34221dbe34a15b78 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >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 <nick@bywatersolutions.com> >--- > 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
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 20310
:
73142
|
73143
|
73805
|
73998
|
74000
|
74992
|
74993
|
74994
|
88887
|
88888
|
88889
|
109750
|
109751
|
109752
|
109753
|
111467
|
111468
|
111469
|
111470
|
118976
|
118977
|
118978
|
118979
|
119346
|
122469
|
122470
|
122471
|
122472
|
122473
|
122474
|
122475
|
122725
|
122726
|
122727
|
122728
|
122729
|
122730
|
122731
| 122732