From 9319ab3254c0a0b1ed63bb745136d5f3a19d6658 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 8 Feb 2011 22:05:39 -0500
Subject: [PATCH] Fix for Bug 5715, Adding note about ReservesMaxPickUpDelay
 value

Also correcting display of itemtype based on item-level_itype preference

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 circ/waitingreserves.pl                                        | 3 ++-
 .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index e924bcff75..0183f19472 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -155,7 +155,8 @@ $template->param(
     overloop    => \@overloop,
     overcount   => $overcount,
     show_date   => format_date(C4::Dates->today('iso')),
-	dateformat  => C4::Context->preference("dateformat"),
+    dateformat  => C4::Context->preference("dateformat"),
+    ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index 65874571a4..e25c4918ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -116,6 +116,7 @@ $.tablesorter.addParser({
         <!-- /TMPL_IF -->
         </div>
         <div id="holdsover">
+                <p>Holds listed here have been awaiting pickup for more than <!-- TMPL_VAR NAME="ReservesMaxPickUpDelay" --> days.</p>
                 <!-- TMPL_IF NAME="overloop" -->
                <table id="holdso">
                <thead><tr>
@@ -130,7 +131,7 @@ $.tablesorter.addParser({
                         <td><p><!-- TMPL_VAR NAME="waitingdate" --></p></td>
                         <td><!-- TMPL_INCLUDE NAME="biblio-default-view.inc" --><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" ESCAPE="html" -->
                         </a>
-                            &nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)
+                            <!-- TMPL_UNLESS NAME="item_level_itypes" --><!-- TMPL_IF NAME="itemtype" -->&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)<!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
                         <br />Barcode: <!-- TMPL_VAR NAME="barcode" -->
                     </td>
                     <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" -->, <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
-- 
2.39.5