From f7d2adddb601e399687b469a67569cb738cf21b7 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 1 Mar 2018 15:25:44 +0100 Subject: [PATCH] Bug 17530: Use may_article_request method in opac-search Content-Type: text/plain; charset=utf-8 If you enable pref ArticleRequests, until now all search results got the 'Request article' link. This patch tries to improve the situation by using the new sub with the itemtype of the search result. In most cases the number of links will drastically decrease. It may still be possible sometimes that a link is shown while it effectively is not possible, but we do not get the performance burden of determining that and going through all items. Test plan: [1] Look for two borrowers P1 and P2 within categories C1 resp. C2. [2] Look for two biblios B1 and B2 with default item types I1 resp. I2. (See 942c in case of MARC21.) [3] Make sure that no circ rules allow article requests. Enable the pref. [4] Add/modify circ rule category=C1, itemtype=I1, art_req=yes. Log out. Search for B1 and B2, verify that only B1 has AR link. Log in as P1. Verify that only B1 has AR link. Log in as P2. Verify that no biblio has AR link. [5] Add/modify circ rule category=C2, itemtype=I2, art_req=item_only. Log out. Search for B1 and B2, verify that both have AR links. Log in as P1. Verify that only B1 has AR link. Log in as P2. Verify that only B2 has AR link. Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +- opac/opac-search.pl | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index b0bf5a6..66bdba8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -510,7 +510,7 @@ [% END # IF RequestOnOpac %] [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %] - [% IF Koha.Preference('ArticleRequests') %] + [% IF SEARCH_RESULT.artreqpossible %] Request article [% END %] [% END %] diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 1d7615b..2203e5f 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -56,6 +56,7 @@ use Koha::ItemTypes; use Koha::Ratings; use Koha::Virtualshelves; use Koha::Library::Groups; +use Koha::Patrons; use POSIX qw(ceil floor strftime); use URI::Escape; @@ -641,6 +642,12 @@ for (my $i=0;$i<@servers;$i++) { } $hits = 0 unless @newresults; + my $categorycode; # needed for may_article_request + if( $borrowernumber && C4::Context->preference('ArticleRequests') ) { + my $patron = Koha::Patrons->find( $borrowernumber ); + $categorycode = $patron ? $patron->categorycode : undef; + } + foreach my $res (@newresults) { # must define a value for size if not present in DB @@ -696,6 +703,12 @@ for (my $i=0;$i<@servers;$i++) { $res->{ratings} = $ratings; $res->{my_rating} = $borrowernumber ? $ratings->search({ borrowernumber => $borrowernumber })->next : undef; } + + # BZ17530: 'Intelligent' guess if result can be article requested + $res->{artreqpossible} = Koha::Biblio->may_article_request({ + categorycode => $categorycode, + itemtype => $res->{itemtype}, + }); } if ($results_hashref->{$server}->{"hits"}){ -- 2.1.4