From d00d0721b2898481e148480906502c5445cc4dec Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 13 Apr 2011 16:06:06 -0400
Subject: [PATCH] Fix for Bug 6183, "Cancel marked requests" button has become
 "Renew checked items"

Also includes a fixes for Bug 6168 (Can't delete holds from circulation page)
and Bug 6105 (Cancel a reserve from moremember.pl doesn't work)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/modules/circ/circulation.tt |  4 ++--
 .../prog/en/modules/members/moremember.tt             | 11 ++++-------
 2 files changed, 6 insertions(+), 9 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 f383c21d67..d1b4dad592 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -900,7 +900,7 @@ No patron matched <span class="ex">[% message %]</span>
 
 <div id="reserves">
 [% IF ( reservloop ) %]
-<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
+    <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
 	<input type="hidden" name="from" value="circ" />
     <table id="holdst">
         <thead><tr>
@@ -933,7 +933,7 @@ No patron matched <span class="ex">[% message %]</span>
                     <option value="del">Yes</option>
                 </select>
                 <input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" />
-                <input type="hidden" name="borrowernumber" value="[% reservloo.borrowernumber %]" />
+                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
                 <input type="hidden" name="reservenumber" value="[% reservloo.reservenumber %]" />
             </td>
             </tr>
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 9fb1736a27..c2c37dbed9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -610,18 +610,15 @@ function validate1(date) {
                     <option value="del">Yes</option>
                 </select>
                 <input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" />
-                <input type="hidden" name="borrowernumber" value="[% reservloo.borrowernumber %]" />
+                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
             </td>
         </tr>
 		[% END %]</tbody>
     </table>
 
-        <fieldset class="action">
-        <input type="submit" name="renew_checked" value="Renew or Return checked items" />
-        <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
-        </fieldset>
-    [% ELSE %]<p>Patron has nothing checked out.</p>[% END %]
-</form>
+        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></fieldset>
+    </form>
+    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
 	</div>
 
 </div>
-- 
2.39.5