From 2a6b1b1901f484e77c0c53894ad3d7dab10af8e9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 16 Nov 2021 16:46:44 +0000 Subject: [PATCH] Bug 29394: (follow-up) Pass correct time format and other corrections This patch makes a few corrections, including adding the correct Flatpickr date format option when the timepicker is enabled. The patch also corrects a couple of places where the wrong date field was modified with the new data attributes. To test, apply the patch and test the datepickers on the batch checkout and renew pages. When you select a date and time the "TimeFormat" system preference should be correctly applied. --- koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 1 + .../prog/en/modules/circ/circulation_batch_checkouts.tt | 6 +----- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 8 ++------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc index f67bffe313..01a822381a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -98,6 +98,7 @@ } if ( $(this).data('flatpickr-enable-time') === true ) { options['enableTime'] = true; + options['dateFormat'] = flatpickr_dateformat_string + " " + flatpickr_timeformat_string; } $(this).flatpickr(options); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index dc584eabdc..7f05904fae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -112,11 +112,7 @@
Due date: - [% IF Koha.Preference('SpecifyDueDate') %] - - [% ELSE %] - - [% END %] +
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index 499c09bd27..f01cfb8221 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -171,11 +171,7 @@ [% END %]
- [% IF Koha.Preference('SpecifyDueDate') %] - - [% ELSE %] - - [% END %] +
@@ -224,7 +220,7 @@
- +
-- 2.20.1