Bugzilla – Attachment 8695 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 - Switch from C4::Dates to $KohaDates
Bug-7641---Add-ability-to-suspend-reserves---Follo.patch (text/plain), 3.66 KB, created by
Kyle M Hall
on 2012-03-29 15:50:47 UTC
(
hide
)
Description:
Bug 7641 - Add ability to suspend reserves - Followup - Switch from C4::Dates to $KohaDates
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2012-03-29 15:50:47 UTC
Size:
3.66 KB
patch
obsolete
>From ec9de4abc3b4f08e8e72965225a24de521208aca 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 > >--- > circ/circulation.pl | 2 +- > .../prog/en/modules/circ/circulation.tt | 2 +- > .../prog/en/modules/members/moremember.tt | 2 +- > members/moremember.pl | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index a2528b9..b8d5de2 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -359,7 +359,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 6e4d3c0..b12756b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -977,7 +977,7 @@ 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> >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 7099562..efcf40f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -625,7 +625,7 @@ 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 | $KohaDate %][% END %][% END %]</td> > </tr> > [% END %]</tbody> > </table> >diff --git a/members/moremember.pl b/members/moremember.pl >index 2f1d287..21d2071 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -391,7 +391,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