Permalink
Browse files

Fix for Bug 6183, "Cancel marked requests" button has become "Renew c…

…hecked 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>
  • Loading branch information...
1 parent d4f2bde commit d00d0721b2898481e148480906502c5445cc4dec @oleonard oleonard committed with ranginui Apr 13, 2011
@@ -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>
@@ -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>

0 comments on commit d00d072

Please sign in to comment.