From ca556edead38ea5681cb25a201b1168d9a95f919 Mon Sep 17 00:00:00 2001 From: Kyle M Hall 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 [% message %] - [% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until %][% END %][% END %] + [% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until | $KohaDates %][% END %][% END %] [% END %] 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..243d1bc 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) { - [% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until %][% END %][% END %] + [% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until | $KohaDates %][% END %][% END %] [% END %] 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