From f9b412cdd1812337faa45461198c40217145cdb9 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 4 Sep 2013 12:14:07 -0400 Subject: [PATCH] Bug 10820 - Lost items on search results don't jive with record details In the OPAC, if an items is both lost and checked out, it will show as lost on the search results, and checkout out in the record details. The lost status should take precedence over the checked out status, as the checked out status may lead a patron to believe the book may return soon. Test Plan: 1) Check an item out to a patron 2) Set it to lost ( requires itemlost to be revealed in the framework for the items editor ). 3) Rebuild your zebra indexes 4) Run a search where that item is in the results list 5) Note the item is marked as lost 6) View the record details 7) Note the item is listed as "checked out" 8) Apply this patch 9) Repeat steps 4-6, note the item is now listed as lost Signed-off-by: Chris Cormack --- .../opac-tmpl/prog/en/includes/item-status.inc | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc index 98fdb38..c0aa10c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc @@ -1,6 +1,17 @@ [% USE KohaAuthorisedValues %] -[% IF ( item.datedue ) %] +[% IF ( item.itemlost ) %] + [% av_lib_include = KohaAuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %] + [% IF ( av_lib_include ) %] + [% av_lib_include %] + [% ELSE %] + [% IF ( item.lostimageurl ) %] + [% item.lostimagelabel %] + [% ELSE %] + Item lost + [% END %] + [% END %] +[% ELSIF ( item.datedue ) %] [% IF ( OPACShowCheckoutName ) %] Checked out to [% item.cardnumber %] [% item.firstname %] [% item.surname %] [% ELSE %] @@ -13,17 +24,6 @@ On hold [% ELSIF ( item.wthdrawn ) %] Item withdrawn -[% ELSIF ( item.itemlost ) %] - [% av_lib_include = KohaAuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %] - [% IF ( av_lib_include ) %] - [% av_lib_include %] - [% ELSE %] - [% IF ( item.lostimageurl ) %] - [% item.lostimagelabel %] - [% ELSE %] - Item lost - [% END %] - [% END %] [% ELSIF ( item.itemnotforloan ) %] [% IF ( item.notforloanvalueopac ) %] [% item.notforloanvalueopac %] [% IF ( item.restrictedopac ) %]([% item.restrictedopac %])[% END %] -- 1.8.4.rc2