Merge remote-tracking branch 'origin/new/bug_2780'

[koha_fer] / opac / opac-user.pl

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index b89e862..a9a6305 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -263,6 +263,7 @@ foreach my $res (@reserves) {
     if ($OPACDisplayRequestPriority) {
         $res->{'priority'} = '' if $res->{'priority'} eq '0';
     }
+    $res->{'suspend_until'} = C4::Dates->new( $res->{'suspend_until'}, "iso")->output("syspref") if ( $res->{'suspend_until'} );
 }
 
 # use Data::Dumper;
@@ -360,5 +361,8 @@ $template->param(
     dateformat    => C4::Context->preference("dateformat"),
 );
 
+$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
+$template->param( AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') );
+
 output_html_with_http_headers $query, $cookie, $template->output;