From 078f9d3f5ed21c24b6e023ede1b81a32c95b11fc Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 23 Feb 2023 17:10:32 +0000 Subject: [PATCH] Bug 32611: Not for loan items don't show the specific not for loan value in OPAC detail page This patch corrects what appear to be some copy-paste errors which resulted in the "not for loan" authorized value description not displaying, instead the generic "Not for loan" is shown. The patch also adds another case for displaying the item restricted status. Previously items.restricted would only display if the item *also* had a notforloan value. To test it's probably easiest to find a record with multiple items and set various item statuses (damaged, notforloan, lost, restricted) and confirm that the right description is shown. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 23c69dbfc2fbd6d393468fdadb5c0f28e9896a92) Signed-off-by: Matt Blenkinsop --- koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc index 0d5713d5aa..aac8ece2ee 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc @@ -91,10 +91,10 @@ [% END %] -[% SET restricted_lib = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => item.withdrawn, opac => 1 ) %] +[% SET restricted_lib = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.restricted', authorised_value => item.restricted, opac => 1 ) %] [% IF item.notforloan %] [% SET itemavailable = 0 %] - [% notforloan_lib = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => item.withdrawn, opac => 1 ) %] + [% notforloan_lib = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan, opac => 1 ) %] [% IF notforloan_lib %] [% notforloan_lib | html %] [% IF restricted_lib %]([% restricted_lib | html %])[% END %] [% ELSE %] @@ -103,6 +103,10 @@ [% ELSIF item.itemtype.notforloan %] [% SET itemavailable = 0 %] Not for loan [% IF restricted_lib %]([% restricted_lib | html %])[% END %] +[% ELSE %] + [% IF restricted_lib %] + [% restricted_lib | html %] + [% END %] [% END %] [% IF ( item.bundle_host ) %] -- 2.39.5