Bugzilla – Attachment 104228 Details for
Bug 25133
Specify Due date changes from PM to AM if library has their TimeFormat set to 12hr
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25133: Fix time part of due date for 12hr
Bug-25133-Fix-time-part-of-due-date-for-12hr.patch (text/plain), 2.96 KB, created by
Katrin Fischer
on 2020-05-03 20:51:05 UTC
(
hide
)
Description:
Bug 25133: Fix time part of due date for 12hr
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2020-05-03 20:51:05 UTC
Size:
2.96 KB
patch
obsolete
>From acfda75ad5e464145b2379234c65cbb61b86283e Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 17 Apr 2020 12:11:25 +0200 >Subject: [PATCH] Bug 25133: Fix time part of due date for 12hr > >With Timeformat system preference set to 12 hours format: > >Prior to 19.05.08, when due date was specified at checkout, >the time in the box would show in 24hr format (e.g. 15:59) >while the due date in the patron's checkouts would show >in 12hr format (e.g. 3:59 PM). > >After 19.05.08, the format in the specify a due date box >shows in 24hr format and the due date in 12hr format >(in patron checkouts) as before. > >But when checking out multiple items using the specify due >date option for the session, the time changes from PM to >AM. > >To test: >- Check out an item with specified due date 15:50 PM >- Check out a second item in same transaction >- Verify date changed to AM >- Apply patch >- Repeat >- Verify this time the date is kept as set > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> > >Signed-off-by: Kelly McElligott <kelly@bywatersolutions.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 6 ++++++ > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- > 2 files changed, 7 insertions(+), 1 deletion(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >index 5b4f809b8f..fe18adfbda 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >@@ -123,6 +123,12 @@ jQuery(function($){ > showMonthAfterYear: false, > yearSuffix: ''}; > $.datepicker.setDefaults($.datepicker.regional['']); >+ $.timepicker.regional[''] = { >+ timeFormat: "[% IF Koha.Preference('TimeFormat') == '12hr' %]hh:mm TT[% ELSE %]HH:mm[% END %]", >+ amNames: ['AM', 'A'], >+ pmNames: ['PM', 'P'], >+ }; >+ $.timepicker.setDefaults($.timepicker.regional['']); > }); > > /* jQuery Validator plugin custom method >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 9087ccb03d..7423164850 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -236,7 +236,7 @@ > > [% IF ( INVALID_DATE ) %] > <p> >- <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec | html %]" /> >+ <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec | $KohaDates as_due_date => 1 %]" /> > <label for="duedatespec">Due date</label> > </p> > [% ELSE %] >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25133
:
103137
|
103236
|
103366
|
103367
|
103368
|
103369
|
103370
|
103371
| 104228 |
104229
|
104230
|
104260
|
104269