From d1dc3c0c2e7064880efc807ed35a09f7fa8b24bb 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 * Fix 'Resume All Suspended All Requests' * Change button text to follow capitalization rules * Change 'requests' to 'holds' Signed-off-by: Paul Poulain --- circ/circulation.pl | 2 +- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 8 ++++---- .../intranet-tmpl/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 2c93547517..bcbcb6fb91 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 57c16ee377..0cdd2dcd5e 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 [% 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 %] -
+
- + [% IF AutoResumeSuspendedHolds %] @@ -1032,7 +1032,7 @@ No patron matched [% message %] - +
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 b568ec93a3..0c8287a809 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) { - [% 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 %] -
+
- + [% IF AutoResumeSuspendedHolds %] @@ -693,7 +693,7 @@ function validate1(date) { - +
diff --git a/members/moremember.pl b/members/moremember.pl index 32541c9eda..cc9afb9220 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 ); } -- 2.39.5