From a332214dd3880856c3577476ad45018896faf113 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Tue, 29 May 2018 09:15:09 +0000 Subject: [PATCH] Bug 20806: Add item type description holds history page Test plan: 0) Do not apply the patch 1) Set AllowHoldItemTypeSelection to Allow 2) Place some hold for a patron, some with specific item type and some without item type 3) On holds history page you should see blank or item type code in item type column 4) Apply the patch 5) Now you should see description in item type column 6) Set AllowHoldItemTypeSelection to Don't Allow 7) You shold not see the item type column, but column visibility settings should continue working ;) Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 0c1490ec7111fb6160458463d98ccda333f347b3) Signed-off-by: Martin Renvoize --- .../prog/en/modules/members/holdshistory.tt | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt index f2e8ebbf5f..ff19d79c36 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt @@ -4,6 +4,7 @@ [% USE AuthorisedValues %] [% USE Branches %] [% USE ColumnsSettings %] +[% USE ItemTypes %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %] @@ -32,6 +33,8 @@
This patron has no holds history.
[% ELSE %] +[% SET show_itemtype_column = Koha.Preference('AllowHoldItemTypeSelection') %] +
@@ -43,7 +46,9 @@ - + [% IF show_itemtype_column %] + + [% END %] @@ -74,7 +79,15 @@ [% END %] - + [% IF show_itemtype_column %] + + [% END %]
Expiration date Waiting date Cancellation dateItem typeRequested item typeStatus
[% hold.itemtype %] + [% IF hold.itemtype %] + [% ItemTypes.GetDescription( hold.itemtype ) %] + [% ELSE %] + Any item type + [% END %] + [% IF hold.found == 'F' %] Fulfilled @@ -110,6 +123,10 @@