Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 7641 - Add ability to suspend reserves - Followup

Browse source 
* Switch from C4::Dates to $KohaDates
  * Fix 'Resume All Suspended All Requests'
  * Change button text to follow capitalization rules
  * Change 'requests' to 'holds'

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This commit is contained in:
Kyle Hall 2012-03-29 11:50:43 -04:00 committed by Paul Poulain
parent ef038b258e
commit d1dc3c0c2e
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
circ/circulation.pl
View file

@ -355,7 +355,7 @@ if ($borrowernumber) {
$getreserv{biblionumber} = $getiteminfo->{'biblionumber'}; $getreserv{biblionumber} = $getiteminfo->{'biblionumber'};
$getreserv{waitingat} = GetBranchName( $num_res->{'branchcode'} ); $getreserv{waitingat} = GetBranchName( $num_res->{'branchcode'} );
$getreserv{suspend} = $num_res->{'suspend'}; $getreserv{suspend} = $num_res->{'suspend'};
$getreserv{suspend_until} = C4::Dates->new( $num_res->{'suspend_until'}, "iso")->output("syspref"); $getreserv{suspend_until} = $num_res->{'suspend_until'};
# check if we have a waiting status for reservations # check if we have a waiting status for reservations
if ( $num_res->{'found'} eq 'W' ) { if ( $num_res->{'found'} eq 'W' ) {
$getreserv{color} = 'reserved'; $getreserv{color} = 'reserved';

8
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
View file

@ -977,18 +977,18 @@ No patron matched <span class="ex">[% message %]</span>
<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
<input type="hidden" name="reservenumber" value="[% reservloo.reservenumber %]" /> <input type="hidden" name="reservenumber" value="[% reservloo.reservenumber %]" />
</td> </td>
<td>[% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until %][% END %][% END %]</td> <td>[% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until | $KohaDates %][% END %][% END %]</td>
</tr> </tr>
[% END %]</tbody> [% END %]</tbody>
</table> </table>
<fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></fieldset> <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
</form> </form>
<fieldset class="action"> <fieldset class="action">
<form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post"> <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
<input type="hidden" name="from" value="circ" /> <input type="hidden" name="from" value="circ" />
<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
<input type="submit" value="Suspend All Requests" /> <input type="submit" value="Suspend all holds" />
[% IF AutoResumeSuspendedHolds %] [% IF AutoResumeSuspendedHolds %]
<label for="suspend_until">until</label> <label for="suspend_until">until</label>
@ -1032,7 +1032,7 @@ No patron matched <span class="ex">[% message %]</span>
<input type="hidden" name="from" value="circ" /> <input type="hidden" name="from" value="circ" />
<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
<input type="hidden" name="suspend" value="0" /> <input type="hidden" name="suspend" value="0" />
<input type="submit" value="Resume All Suspended All Requests" /> <input type="submit" value="Resume all suspended holds" />
</form> </form>
</fieldset> </fieldset>

8
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
View file

@ -638,18 +638,18 @@ function validate1(date) {
<input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" /> <input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" />
<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
</td> </td>
<td>[% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until %][% END %][% END %]</td> <td>[% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until | $KohaDates %][% END %][% END %]</td>
</tr> </tr>
[% END %]</tbody> [% END %]</tbody>
</table> </table>
<fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></fieldset> <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
</form> </form>
<fieldset class="action"> <fieldset class="action">
<form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post"> <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
<input type="hidden" name="from" value="borrower" /> <input type="hidden" name="from" value="borrower" />
<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
<input type="submit" value="Suspend All Requests" /> <input type="submit" value="Suspend all holds" />
[% IF AutoResumeSuspendedHolds %] [% IF AutoResumeSuspendedHolds %]
<label for="suspend_until">until</label> <label for="suspend_until">until</label>
@ -693,7 +693,7 @@ function validate1(date) {
<input type="hidden" name="from" value="borrower" /> <input type="hidden" name="from" value="borrower" />
<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
<input type="hidden" name="suspend" value="0" /> <input type="hidden" name="suspend" value="0" />
<input type="submit" value="Resume All Suspended All Requests" /> <input type="submit" value="Resume all suspended holds" />
</form> </form>
</fieldset> </fieldset>

2
members/moremember.pl
View file

@ -321,7 +321,7 @@ if ($borrowernumber) {
} }
$getreserv{waitingposition} = $num_res->{'priority'}; $getreserv{waitingposition} = $num_res->{'priority'};
$getreserv{suspend} = $num_res->{'suspend'}; $getreserv{suspend} = $num_res->{'suspend'};
$getreserv{suspend_until} = C4::Dates->new( $num_res->{'suspend_until'}, "iso")->output("syspref");; $getreserv{suspend_until} = $num_res->{'suspend_until'};
push( @reservloop, \%getreserv ); push( @reservloop, \%getreserv );
} }