From 6e6da1f0c95f03d1a63acf58d568fa6406abd22e Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Fri, 17 May 2019 16:06:41 +0200 Subject: [PATCH] Bug 22922: Use jQuery datepicker instead of --- koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 4 ++-- reserve/modrequest.pl | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index dbb9ccf632..227f0089df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -108,12 +108,12 @@ [% hold.notes | html %] [% IF Koha.Preference('AllowHoldDateInFuture') %] - + [% ELSE %] [% hold.date | $KohaDates %] [% END %] - + [% IF ( hold.found ) %] diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl index 04c1b7d162..e75fac73ac 100755 --- a/reserve/modrequest.pl +++ b/reserve/modrequest.pl @@ -27,6 +27,7 @@ use CGI qw ( -utf8 ); use C4::Output; use C4::Reserves; use C4::Auth; +use Koha::DateUtils qw( dt_from_string ); my $query = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -72,13 +73,13 @@ else { my $params = { rank => $rank[$i], reserve_id => $reserve_id[$i], - expirationdate => $expirationdates[$i], + expirationdate => $expirationdates[$i] ? dt_from_string($expirationdates[$i]) : undef, branchcode => $branch[$i], itemnumber => $itemnumber[$i], suspend_until => $suspend_until[$i] }; if (C4::Context->preference('AllowHoldDateInFuture')) { - $params->{reservedate} = $reservedates[$i]; + $params->{reservedate} = $reservedates[$i] ? dt_from_string($reservedates[$i]) : undef; } ModReserve($params); -- 2.20.1