From b71941e8d849abd45b8aa260cb6aa307ef7a2715 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 21 Aug 2019 02:24:11 +0000 Subject: [PATCH] Bug 23482: Fix BakerTaylor cover images on lists While this needs a username/pass to fully test, it should be possible to verify the code changes by comparing to opac-results code To test: 1 - Enable BakerTaylor images 2 - Enter your usernme and password 3 - Do not fill the BookStore URL 4 - Verify OPAC covers are working 5 - Save some times with covers to a public list 6 - Verify they do not display in list 7 - Apply patch 8 - Verify images now work Signed-off-by: Kelly McElligott --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 15 +++++++++++++-- opac/opac-shelves.pl | 14 ++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index ebaa86e27d..63b9a7128e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -368,10 +368,21 @@ [% END %] - [% IF ( BakerTaylorEnabled ) %] + [% IF ( Koha.Preference('BakerTaylorEnabled') && !Koha.Preference('BakerTaylorBookstoreURL') ) %] [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor + [% ELSE %] + No cover image available + [% END %] + [% END %] + + [% IF ( Koha.Preference('BakerTaylorEnabled') && Koha.Preference('BakerTaylorBookstoreURL') ) %] + [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] + [% IF ( bt_id ) %] + + See Baker & Taylor + [% ELSE %] No cover image available [% END %] diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl index cd04709af3..f9e3f22bde 100755 --- a/opac/opac-shelves.pl +++ b/opac/opac-shelves.pl @@ -40,6 +40,13 @@ use Koha::RecordProcessor; use constant ANYONE => 2; +BEGIN { + if (C4::Context->preference('BakerTaylorEnabled')) { + require C4::External::BakerTaylor; + import C4::External::BakerTaylor qw(&image_url &link_url); + } +} + my $query = new CGI; my $template_name = $query->param('rss') ? "opac-shelves-rss.tt" : "opac-shelves.tt"; @@ -69,6 +76,13 @@ if( $op eq 'view' || $op eq 'list' ){ }); } +if (C4::Context->preference("BakerTaylorEnabled")) { + $template->param( + BakerTaylorImageURL => &image_url(), + BakerTaylorLinkURL => &link_url(), + ); +} + my $referer = $query->param('referer') || $op; my $category = $query->param('category') || 1; my ( $shelf, $shelfnumber, @messages ); -- 2.11.0