From 1f5305d264eb8df62c93f16f4462ebe63640c568 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Tue, 26 Jan 2016 16:33:49 +0100 Subject: [PATCH] Bug 15667: Fix date and branch formatting of messages in patron account display This patch fixes the date and branch formatting of messages in patron account display. To verify: Add a new message to a patron account from the 'checkouts' tab in staff, the displayed date is not correctly formatted and the branch displays as code instead as branch name To test: Apply patch, verify that the messages and branch names are properly formatted. Signed-off-by: Hector Castro Works as described. The message dates in checkouts tab follow dateformat sypref Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com (cherry picked from commit 015e20138a7a400d0da30b0a771a94eede673c05) Signed-off-by: Julian Maurice --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 cf336a2687..a71df92376 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -839,8 +839,8 @@ No patron matched [% message %] [% FOREACH lib_messages_loo IN lib_messages_loop %]
  • - [% lib_messages_loo.message_date_formatted %] - [% lib_messages_loo.branchcode %] + [% lib_messages_loo.message_date_formatted | $KohaDates %] + [% Branches.GetName( lib_messages_loo.branchcode ) %] "[% lib_messages_loo.message %]" [% IF ( lib_messages_loo.can_delete ) %] @@ -853,7 +853,7 @@ No patron matched [% message %]
    • [% END %] [% FOREACH bor_messages_loo IN bor_messages_loop %] -
  • [% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] "[% bor_messages_loo.message %]" [% IF ( bor_messages_loo.can_delete ) %][Delete] +
  • [% bor_messages_loo.message_date_formatted | $KohaDates %] [% Branches.GetName( bor_messages_loo.branchcode ) %] "[% bor_messages_loo.message %]" [% IF ( bor_messages_loo.can_delete ) %][Delete] [% ELSIF ( all_messages_del ) %] [Delete] [% END %]
    • -- 2.39.5