Attachment 37889 Details for Bug 13813 – Bug 13813 - (follow-up) Remove C4::Dates from C4/Members.pm

[patch] Bug 13813 - (follow-up) Remove C4::Dates from C4/Members.pm

Bug-13813---follow-up-Remove-C4Dates-from-C4Member.patch (text/plain), 3.14 KB, created by Jonathan Druart on 2015-04-15 08:14:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-04-15 08:14:37 UTC

Size: 3.14 KB

patch

obsolete

>From 93764d8f4d42a77251e10ec85edf84f7dbbef4f8 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>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 <jonathan.druart@biblibre.com>
>---
> 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 %]
> 				<li>
> 					
>-						[% 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 %]
> 				</li>
> 			[% END %]
> 			[% FOREACH bor_messages_loo IN bor_messages_loop %]
>-				<li>[% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] "[% bor_messages_loo.message %]" [% IF ( bor_messages_loo.can_delete ) %]<a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&amp;borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a>
>+				<li>[% bor_messages_loo.message_date | $KohaDates %] [% bor_messages_loo.branchcode %] "[% bor_messages_loo.message %]" [% IF ( bor_messages_loo.can_delete ) %]<a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&amp;borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a>
> [% ELSIF ( all_messages_del ) %]
> <a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&amp;borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a>
> [% END %]</li>
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 13813: 36827 | 36828 | 36829 | 36830 | 36831 | 36832 | 36835 | 36836 | 36839 | 36845 | 36850 | 36851 | 36855 | 36857 | 36858 | 36859 | 36862 | 36863 | 36864 | 36865 | 36870 | 36871 | 36872 | 36878 | 36879 | 36880 | 36881 | 36882 | 36883 | 36884 | 36885 | 36886 | 36887 | 36888 | 36889 | 36890 | 36892 | 36893 | 36894 | 36895 | 36896 | 36897 | 36898 | 36899 | 36900 | 36901 | 36902 | 37227 | 37730 | 37731 | 37732 | 37736 | 37737 | 37746 | 37748 | 37749 | 37753 | 37754 | 37757 | 37762 | 37763 | 37764 | 37765 | 37766 | 37767 | 37768 | 37770 | 37810 | 37828 | 37835 | 37839 | 37840 | 37841 | 37842 | 37843 | 37853 | 37854 | 37855 | 37856 | 37857 | 37858 | 37859 | 37860 | 37861 | 37862 | 37863 | 37864 | 37865 | 37866 | 37867 | 37868 | 37869 | 37870 | 37871 | 37872 | 37873 | 37874 | 37875 | 37876 | 37877 | 37878 | 37879 | 37880 | 37881 | 37882 | 37883 | 37884 | 37885 | 37886 | 37887 | 37888 | 37889 | 37890 | 37891 | 39666 | 40894 | 42052 | 42175 | 42274 | 42286 | 42292 | 42293 | 42294