From 93764d8f4d42a77251e10ec85edf84f7dbbef4f8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 15 Apr 2015 10:01:59 +0200 Subject: [PATCH] Bug 13813 - (follow-up) Remove C4::Dates from C4/Members.pm message_date_formatted is only used once in the template. Previous patch does not formatted correctly the date (was in iso). The easier for me was to use the KohaDates TT plugin Signed-off-by: Jonathan Druart --- C4/Members.pm | 8 +------- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index bb5aef0..2db85d1 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -2359,14 +2359,8 @@ sub GetMessages { AND messages.branchcode = branches.branchcode ORDER BY message_date DESC"; my $sth = $dbh->prepare($query); - $sth->execute( $borrowernumber, $type ) ; - my @results; - while ( my $data = $sth->fetchrow_hashref ) { - $data->{message_date_formatted} = output_pref({ dt => dt_from_string( $data->{message_date} ), dateformat => 'iso', dateonly => 1 }); - push @results, $data; - } - return \@results; + return $dbh->selectall_arrayref( $query, { Slice => {} }, $borrowernumber, $type ); } 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 233114d..96f2b93 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -777,7 +777,7 @@ No patron matched [% message %] [% FOREACH lib_messages_loo IN lib_messages_loop %]
  • - [% lib_messages_loo.message_date_formatted %] + [% lib_messages_loo.message_date | $KohaDates %] [% lib_messages_loo.branchcode %] "[% lib_messages_loo.message %]" @@ -791,7 +791,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 | $KohaDates %] [% bor_messages_loo.branchcode %] "[% bor_messages_loo.message %]" [% IF ( bor_messages_loo.can_delete ) %][Delete] [% ELSIF ( all_messages_del ) %] [Delete] [% END %]
  • -- 2.1.0