From ed9b0c551ef1a87303c8cfbc6204ddf83dabacb6 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 14 Apr 2011 09:40:21 -0500
Subject: [PATCH] Incremental fix for Bug 3514, Returning items through patron
 details tab

Note: Signed off with the understanding that this partial fix still doesn't compensate for items that need to be transited home (i.e. have no holds, but are not being returned at their home branch.)
 This behavior is much better than the old behavior, however.

Hiding the "check in" checkbox for items which are on hold. This
mitigates the problem of checkins not triggering holds prompts
by forcing the librarian to check in these items individually.

This fix should be considered temporary until a more comprehensive
fix can be developed which incorporates handling for holds.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../prog/en/modules/circ/circulation.tt          | 16 ++++++++++++++--
 .../prog/en/modules/members/moremember.tt        |  4 ++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index ae5c0a664f..e63d289beb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -718,7 +718,7 @@ No patron matched <span class="ex">[% message %]</span>
                 <span class="renewals-disabled">
             [% END %]
 		[% IF ( todayissue.renew_error_on_reserve ) %]
-			On Hold
+			<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On Hold</a>
 		[% END %]
                 [% IF ( todayissue.renew_error_too_many ) %]
 			Not Renewable
@@ -732,9 +732,15 @@ No patron matched <span class="ex">[% message %]</span>
   [% IF ( todayissue.return_failed ) %]
             <td class="problem">Checkin Failed</td>
       [% ELSE %]
+            [% IF ( todayissue.renew_error_on_reserve ) %]
+               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On Hold</a>
+                <input type="checkbox" name="all_barcodes[]" value="[% todayissue.barcode %]" checked="checked" style="display: none;" />
+                </td>
+            [% ELSE %]
             <td><input type="checkbox" class="radio" name="barcodes[]"  value="[% todayissue.barcode %]" />
                 <input type="checkbox" name="all_barcodes[]" value="[% todayissue.barcode %]" checked="checked" style="display: none;" />
             </td>
+            [% END %]
       [% END %]
     </tr>
     [% END %] <!-- /loop todayissues -->
@@ -786,7 +792,7 @@ No patron matched <span class="ex">[% message %]</span>
                 <span class="renewals-disabled">
             [% END %]
 		[% IF ( previssue.renew_error_on_reserve ) %]
-			On Hold
+			<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On Hold</a>
 		[% END %]
                 [% IF ( previssue.renew_error_too_many ) %]
 			Not Renewable
@@ -800,9 +806,15 @@ No patron matched <span class="ex">[% message %]</span>
 		  [% IF ( previssue.return_failed ) %]
             <td class="problem">Checkin Failed</td>
         [% ELSE %]
+            [% IF ( previssue.renew_error_on_reserve ) %]
+               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On Hold</a>
+                <input type="checkbox" name="all_barcodes[]" value="[% previssue.barcode %]" checked="checked" style="display: none;" />
+                </td>
+            [% ELSE %]
             <td><input type="checkbox" class="radio" name="barcodes[]"  value="[% previssue.barcode %]" />
                 <input type="checkbox" name="all_barcodes[]" value="[% previssue.barcode %]" checked="checked" style="display: none;" />
             </td>
+            [% END %]
       [% END %]
     </tr>
     <!-- /loop previssues -->[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 954e4a66c3..f8073bb82d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -493,9 +493,13 @@ function validate1(date) {
       [% IF ( issueloo.return_failed ) %]
             <td class="problem">Checkin Failed</td>
       [% ELSE %]
+        [% IF ( issueloo.norenew_reason_on_reserve ) %]
+            <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On Hold</a></td>
+        [% ELSE %]
             <td><input type="checkbox" name="barcodes[]"  value="[% issueloo.barcode %]" onclick="uncheck_sibling(this);" />
                 <input type="checkbox" name="all_barcodes[]" value="[% issueloo.barcode %]" checked="checked" style="display: none;" />
             </td>
+        [% END %]
       [% END %]
         </tr>
   [% END %]
-- 
2.39.2