From f23d07ee3b7a8da5bdfb526757fd0a9e29e165e9 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 24 Jun 2016 10:35:25 +0000 Subject: [PATCH] Bug 16780 - Specify due date always sets time as AM when using 12 hour time format MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This regression is occurs because the time format for the checkout date/time widget is only meant to be given in 24 hour format. The time due should not be converted to 12 hr time even if the library has 12 hour set as their preferred time format. Test Plan: 1) Performat a backdated checkout with a date due that has a PM time 2) Note the date/time picker on the confirmition screen shows the time in AM/PM 2) Note the time is not stored correctly 3) Apply this patch 4) Repeate step 1 5) Note the confirmation date/time picker now show the time in 24hr format 6) Note the time was stored correctly Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 7c89f78f3bef1cdebb51dcb41fdda7a8dc252b94) Signed-off-by: Frédéric Demians (cherry picked from commit e0b29cea2ac3f32a8e1322ab680a0bcb513725a8) Signed-off-by: Julian Maurice --- circ/circulation.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index e35c0e89e6..b94b088839 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -154,7 +154,7 @@ for my $barcode ( @$barcodes ) { my $stickyduedate = $query->param('stickyduedate') || $session->param('stickyduedate'); my $duedatespec = $query->param('duedatespec') || $session->param('stickyduedate'); -$duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso' }); } +$duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso', timeformat => '24hr' }); } if ( $duedatespec ); my $restoreduedatespec = $query->param('restoreduedatespec') || $duedatespec || $session->param('stickyduedate'); if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) { -- 2.39.5