Bugzilla – Attachment 8881 Details for
Bug 7641
Add ability to suspend reserves.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7641 - Add ability to suspend reserves - Followup
Bug-7641---Add-ability-to-suspend-reserves---Follo.patch (text/plain), 6.21 KB, created by
Kyle M Hall
on 2012-04-04 17:43:21 UTC
(
hide
)
Description:
Bug 7641 - Add ability to suspend reserves - Followup
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2012-04-04 17:43:21 UTC
Size:
6.21 KB
patch
obsolete
>From e1aaa7f63c0681397ab4ee7cce88288154109852 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 29 Mar 2012 11:50:43 -0400 >Subject: [PATCH] Bug 7641 - Add ability to suspend reserves - Followup > > * Switch from C4::Dates to $KohaDates > * Fix 'Resume All Suspended All Requests' > * Change button text to follow capitalization rules > * Change 'requests' to 'holds' >--- > circ/circulation.pl | 2 +- > .../prog/en/modules/circ/circulation.tt | 8 ++++---- > .../prog/en/modules/members/moremember.tt | 8 ++++---- > members/moremember.pl | 2 +- > 4 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index 2c93547..bcbcb6f 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -355,7 +355,7 @@ if ($borrowernumber) { > $getreserv{biblionumber} = $getiteminfo->{'biblionumber'}; > $getreserv{waitingat} = GetBranchName( $num_res->{'branchcode'} ); > $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 > if ( $num_res->{'found'} eq 'W' ) { > $getreserv{color} = 'reserved'; >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 57c16ee..b3e2f17 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -977,18 +977,18 @@ No patron matched <span class="ex">[% message %]</span> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > <input type="hidden" name="reservenumber" value="[% reservloo.reservenumber %]" /> > </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> > [% END %]</tbody> > </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> > > <fieldset class="action"> > <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post"> > <input type="hidden" name="from" value="circ" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >- <input type="submit" value="Suspend All Requests" /> >+ <input type="submit" value="Suspend all holds" /> > > [% IF AutoResumeSuspendedHolds %] > <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="borrowernumber" value="[% borrowernumber %]" /> > <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> > </fieldset> > >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 b568ec9..0c8287a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -638,18 +638,18 @@ function validate1(date) { > <input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > </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> > [% END %]</tbody> > </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> > <fieldset class="action"> > <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post"> > <input type="hidden" name="from" value="borrower" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >- <input type="submit" value="Suspend All Requests" /> >+ <input type="submit" value="Suspend all holds" /> > > [% IF AutoResumeSuspendedHolds %] > <label for="suspend_until">until</label> >@@ -693,7 +693,7 @@ function validate1(date) { > <input type="hidden" name="from" value="borrower" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > <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> > </fieldset> > >diff --git a/members/moremember.pl b/members/moremember.pl >index 32541c9..cc9afb9 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -321,7 +321,7 @@ if ($borrowernumber) { > } > $getreserv{waitingposition} = $num_res->{'priority'}; > $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 ); > } >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7641
:
7991
|
7992
|
8695
|
8697
|
8698
|
8795
|
8881
|
9178
|
9183
|
9225
|
9440
|
9444