From c73cb7a2cfffb8e5efbf4db125e250dfa69748cc Mon Sep 17 00:00:00 2001 From: CJ Lynce Date: Thu, 3 Oct 2024 18:02:47 +0000 Subject: [PATCH] Bug 38081: maskitoTimeOptionsGenerator does not properly support 12-hour times in calendar.inc This patch corrects an issue where flatpickr time-only input boxes boxes were not having their inputs masked (limited) properly due to maskitoTimeOptionsGenerator not properly supporting 12-hour time inputs for time-only input boxes. To test: 1. Login to the staff intranet. 2. Open Administration->Libraries-> Edit any library. 3. Open your browser's development console (typically via F12) Verify a 'TypeError' message has been thrown for this page. 4. Type in any text into any of the opening hours This should be limiting only to properly formatted HH:MM. 5. Apply patch 6. Repeat steps 2-4 Verify no errors show on your browser's development console. Verify opening hours entry are limited to proper HH:MM format. 7. Open Administration->System Preferences and change TimeFormat to 12-hours, Save. 8. Repeat steps 2-4 Verify opening hours text entry are limited to properly formatted HH:MM AM/PM (or am/pm) Signed-off-by: Jonathan Druart Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc index 7914932d38..edb7268c6b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -99,9 +99,12 @@ dateSeparator: delimiter, overwiteMode: 'replace', }); - } else if ( accepts_time_only ) { - maskitoOptions = maskitoTimeOptionsGenerator({ - }); + } else if ( accepts_time_only ) { + maskitoOptions = { + [% IF Koha.Preference('TimeFormat') == '12hr' -%] mask: [/\d/, /\d/, ':', /\d/, /\d/, ' ', /(a|A|p|P)/, /(m|M)/] + [%- ELSE -%]mask: [/\d/, /\d/, ':', /\d/, /\d/] + [%- END %], + }; } else { maskitoOptions = maskitoDateOptionsGenerator({ mode: altinput_dateformat, -- 2.39.5