From 2c3c9b9adf67a578425abefa93059e106babe0c7 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 22 Oct 2019 14:56:53 +0100 Subject: [PATCH] Bug 22445: Custom cover images - opac shelfbrowser Test plan: Go to the detail page of a bibliographic record (at the OPAC) and confirm the at custom cover images are displayed in the shelf browser Sponsored-by: Orex Digital Signed-off-by: Hayley Mapley Signed-off-by: Hugo Agud Signed-off-by: Owen Leonard Signed-off-by: Michal Denar Signed-off-by: Kyle Hall Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- C4/ShelfBrowser.pm | 31 +++++++------------ .../bootstrap/en/includes/shelfbrowser.inc | 4 +++ 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/C4/ShelfBrowser.pm b/C4/ShelfBrowser.pm index 401776edc0..53fdaef4b3 100644 --- a/C4/ShelfBrowser.pm +++ b/C4/ShelfBrowser.pm @@ -25,6 +25,7 @@ use warnings; use C4::Biblio; use C4::Context; use C4::Koha; +use Koha::Biblios; use Koha::Libraries; use vars qw(@ISA @EXPORT @EXPORT_OK); @@ -220,14 +221,17 @@ sub GetShelfInfo { my $marcflavour = C4::Context->preference("marcflavour"); my @valid_items; for my $item ( @items ) { - my $this_biblio = GetBibData($item->{biblionumber}); - next unless defined $this_biblio; - $item->{'title'} = $this_biblio->{'title'}; - $item->{'subtitle'} = $this_biblio->{'subtitle'}, - $item->{'medium'} = $this_biblio->{'medium'}; - $item->{'part_number'} = $this_biblio->{'part_number'}; - $item->{'part_name'} = $this_biblio->{'part_name'}; - my $this_record = GetMarcBiblio({ biblionumber => $this_biblio->{'biblionumber'} }); + my $biblio = Koha::Biblios->find( $item->{biblionumber} ); + next unless defined $biblio; + + $item->{biblio_object} = $biblio; + $item->{biblionumber} = $biblio->biblionumber; + $item->{title} = $biblio->title; + $item->{subtitle} = $biblio->subtitle; + $item->{medium} = $biblio->medium; + $item->{part_number} = $biblio->part_number; + $item->{part_name} = $biblio->part_name; + my $this_record = GetMarcBiblio({ biblionumber => $biblio->biblionumber }); $item->{'browser_normalized_upc'} = GetNormalizedUPC($this_record,$marcflavour); $item->{'browser_normalized_oclc'} = GetNormalizedOCLCNumber($this_record,$marcflavour); $item->{'browser_normalized_isbn'} = GetNormalizedISBN(undef,$this_record,$marcflavour); @@ -237,15 +241,4 @@ sub GetShelfInfo { return @valid_items; } -# Fetches some basic biblio data needed by the shelf stuff -sub GetBibData { - my ($bibnum) = @_; - - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare("SELECT biblionumber, title, subtitle, medium, part_number, part_name FROM biblio WHERE biblionumber=?"); - $sth->execute($bibnum); - my $bib = $sth->fetchrow_hashref(); - return $bib; -} - 1; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc index 295d4a533f..0cc92f5b91 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc @@ -61,6 +61,10 @@ No cover image available [% END %] [% END %] + [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] + Cover image + [% END %] + [% END %] -- 2.20.1