From ecc3ca5a3d844868d6d4554504a1f0b52c73ee2e Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 28 Nov 2011 13:51:31 +0100 Subject: [PATCH] Bug 7270: Removing double itemtype on shelve contents page Content-Type: text/plain; charset="utf-8" Patch initializes template variable noItemTypeImages now. Adds check for non-empty imageurl in template. --- .../prog/en/modules/virtualshelves/shelves.tt | 2 +- virtualshelves/shelves.pl | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index d7a34a1..12a0665 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -194,7 +194,7 @@ function placeHold () { [% END %] [% UNLESS ( item_level_itypes ) %] - [% UNLESS ( noItemTypeImages ) %][% itemsloo.description %][% END %][% itemsloo.description %] + [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %][% itemsloo.description %][% END %][% itemsloo.description %] [% END %] [% INCLUDE 'biblio-default-view.inc' biblionumber = itemsloo.biblionumber %] diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index 0b208a9..62e1bb4 100755 --- a/virtualshelves/shelves.pl +++ b/virtualshelves/shelves.pl @@ -35,4 +35,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( flagsrequired => { catalogue => 1 }, } ); +$template->param( + noItemTypeImages => C4::Context->preference('noItemTypeImages'), +); shelfpage('intranet', $query, $template, $loggedinuser, $cookie); -- 1.6.0.6