For unknown reasons, having ListImagesForBiblio return undef
when there are no images still results in a variable being passed
to the template which evaluates as true, with a size of 1.
This patch alters ListImagesForBiblio to remove the "return undef"
condition, allowing the template to evaluate images as false
and show no tab.
To test, turn on local cover images and view records in the OPAC
which do and do not have cover images attached. Images should
display as expected when present, and no images tab should appear
on records which have none.
---
C4/Images.pm | 12 +++---------
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 6 +++---
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/C4/Images.pm b/C4/Images.pm
index 8b17f1c..4bae00c 100644
--- a/C4/Images.pm
+++ b/C4/Images.pm
@@ -131,16 +131,10 @@ sub ListImagesForBiblio {
my $query = 'SELECT imagenumber FROM biblioimages WHERE biblionumber = ?';
my $sth = $dbh->prepare($query);
$sth->execute($biblionumber);
- warn "Database error!" if $sth->errstr;
- if ( !$sth->errstr && $sth->rows > 0 ) {
- while ( my $row = $sth->fetchrow_hashref ) {
- push @imagenumbers, $row->{'imagenumber'};
- }
- return @imagenumbers;
- }
- else {
- return undef;
+ while ( my $row = $sth->fetchrow_hashref ) {
+ push @imagenumbers, $row->{'imagenumber'};
}
+ return @imagenumbers;
}
=head2 DelImage
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 3ecdc27..d5c4e97 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -701,9 +701,9 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
</li>
[% END %]
-[% IF ( OPACLocalCoverImages ) %][% IF ( localimages ) %]
+[% IF ( OPACLocalCoverImages && localimages.size ) %]
<li id="tab_images"><a href="#images">Images</a></li>
-[% END %][% END %]
+[% END %]
</ul>
[% IF ( serialcollection ) %]
@@ -1138,7 +1138,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
</table>
</div>[% END %][% END %]
-[% IF ( OPACLocalCoverImages ) %]
+[% IF ( OPACLocalCoverImages && localimages.size ) %]
<div id="images">
<p>Click on an image to view it in the image viewer</p>
[% FOREACH image IN localimages %]
--
1.7.9.5
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
