Attachment 39187 Details for Bug 14194 – [PASSED QA] Bug 14194: Restore the HH:MM to 23:59 for onsite-checkouts

[patch] [PASSED QA] Bug 14194: Restore the HH:MM to 23:59 for onsite-checkouts

PASSED-QA-Bug-14194-Restore-the-HHMM-to-2359-for-o.patch (text/plain), 2.26 KB, created by Katrin Fischer on 2015-05-14 15:06:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2015-05-14 15:06:16 UTC

Size: 2.26 KB

patch

obsolete

>From 06ef983c1cd45d77263a04bbf09b5bf0786b0d82 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@koha-community.org>
>Date: Tue, 12 May 2015 13:11:40 +0200
>Subject: [PATCH] [PASSED QA] Bug 14194: Restore the HH:MM to 23:59 for
> onsite-checkouts
>
>(Introduced by bug 13601)
>
>Test plan
>=========
>1/ enable 'OnSiteCheckouts' pref under Circulation Preferences
>2/ go to the checkouts page and try to issue an item to any user.
>3/ when the item barcode entry form shows, select the 'On-site
>   checkout' checkbox
>4/ the default date due should show as today with 00:00 as HH:MM
>5/ apply the patch
>6/ repeat steps 2 - 3. The default date due should show today's
>   date with 23:59 as HH:MM.
>7/ run koha-qa.pl -c 1 -v 2
>
>Remarks: Testing result match expected test plan output. The QA tests
>         pass with "OK" for the commit.
>
>Technical note: There is a confusion with iso and sql date formats at
>some places in the code.
>A better way should be provided (later) to fix globally the mismatch
>between these 2 formats.
>What happened before this patch: the DateTime was cast to a string and
>the template received "YYYY-MM-DDTHH:MM:SS" which is an iso formatted
>date. BUT this format is not managed by Koha::DateUtils::output_pref
>("iso" and "sql" are considered as indentical which is wrong).
>As I did not estimated the problem (how big it is) I prefer to fix it
>easily (and dirty) for now.
>
>Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg@gmail.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> circ/circulation.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index ab47895..ab6db3b 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -587,7 +587,7 @@ $template->param(
>     AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
>     canned_bor_notes_loop     => $canned_notes,
>     debarments                => GetDebarments({ borrowernumber => $borrowernumber }),
>-    todaysdate                => dt_from_string()->set(hour => 23)->set(minute => 59),
>+    todaysdate                => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),
> );
> 
> output_html_with_http_headers $query, $cookie, $template->output;
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 14194: 39134 | 39137 | 39145 | 39187