From 8476a3939941f0bae9ca647bb71c4d8ba559daf6 Mon Sep 17 00:00:00 2001 From: Brendan Gallagher Date: Thu, 22 May 2014 06:37:16 -0400 Subject: [PATCH] Bug 12307: Catalog details page displaying incorrect status for items with itemtype level notforloan status The template markup that controls that status column for the items table in catalogue/detail.pl does not account for the itemtypes.notforloan flag. Test Plan: 1) Find an item that is currently available 2) Go to the itemtype editor and mark that itemtype of that item as being not for loan 3) Browse to the catalog details page for that item's record 4) Note the item status is still "Available" 5) Apply this patch 6) Reload the catalog details page 7) Note the item status is now "Not for loan" Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Good catch! Works as described, no problems found. Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/catalogue/detail.tt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index fe8d32e5d5..9e17a40aa4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -609,7 +609,7 @@ function verify_images() { [% END %] [% END %] - [% IF ( item.itemnotforloan ) %] + [% IF ( item.itemnotforloan || item.notforloan_per_itemtype ) %] Not for loan [% IF ( item.notforloanvalue ) %] ([% item.notforloanvalue %]) @@ -643,7 +643,16 @@ function verify_images() { [% END %] [% END %] [% END %] - [% UNLESS ( item.itemnotforloan or item.onloan or item.itemlost or item.withdrawn or item.damaged or item.transfertwhen or item.reservedate ) %] + [% UNLESS ( + item.itemnotforloan + or item.notforloan_per_itemtype + or item.onloan + or item.itemlost + or item.withdrawn + or item.damaged + or item.transfertwhen + or item.reservedate + ) %] Available [% END %] -- 2.20.1