Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 38081: maskitoTimeOptionsGenerator does not properly support 12-hour times in calendar.inc

Browse source 
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 <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
CJ Lynce 2024-10-03 18:02:47 +00:00 committed by Katrin Fischer
parent 87a2aa8a62
commit c73cb7a2cf
Signed by: kfischer
GPG key ID: 0EF6E2C03357A834
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
View file

@ -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,