From 5a5200562a8a0b39b95f254d8a5467a9a5629cd8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 24 Apr 2013 10:31:19 +0200 Subject: [PATCH] Bug 9903: Followup: use the KohaDates T::T plugin to display dates. Signed-off-by: Jared Camins-Esakov (cherry picked from commit a8eb99b8ff9aa01479e26665ba8edd1f00c39a53) Signed-off-by: Jared Camins-Esakov --- .../prog/en/modules/members/moremember.tt | 10 +++++----- members/moremember.pl | 7 +------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 8bb96c33d9..0b23a7425a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -474,7 +474,7 @@ function validate1(date) { [% ELSE %] [% END %] - [% issueloo.date_due %] + [% issueloo.date_due | $KohaDates %] [% IF ( issueloo.itemlost ) %] [% issueloo.itemlost %] [% END %] @@ -484,7 +484,7 @@ function validate1(date) { [% issueloo.title |html %][% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] [% issueloo.barcode %] [% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %][% END %][% END %][% issueloo.itemtype_description %] - [% issueloo.issuedate %] + [% issueloo.issuedate | $KohaDates%] [% issueloo.issuingbranchname %] [% issueloo.itemcallnumber %] [% issueloo.charge %] @@ -582,7 +582,7 @@ function validate1(date) { [% ELSE %] [% END %] - [% relissueloo.date_due %] + [% relissueloo.date_due | $KohaDates %] [% IF ( relissueloo.itemlost ) %] [% relissueloo.itemlost %] [% END %] @@ -592,7 +592,7 @@ function validate1(date) { [% relissueloo.title |html %][% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] [% relissueloo.barcode %] [% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %][% END %][% END %][% relissueloo.itemtype_description %] - [% relissueloo.issuedate %] + [% relissueloo.issuedate | $KohaDates %] [% relissueloo.issuingbranchname %] [% relissueloo.itemcallnumber %] [% relissueloo.charge %] @@ -630,7 +630,7 @@ function validate1(date) { [% FOREACH reservloo IN reservloop %] - [% reservloo.reservedate %] + [% reservloo.reservedate | $KohaDates %] [% reservloo.title |html %][% IF ( reservloo.author ) %], by [% reservloo.author %][% END %] diff --git a/members/moremember.pl b/members/moremember.pl index 52da91848f..2e5c66abd3 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -274,8 +274,7 @@ if ($borrowernumber) { foreach (qw(waiting transfered nottransfered)) { $getreserv{$_} = 0; } - $getreserv{reservedate_sort} = $num_res->{'reservedate'}; - $getreserv{reservedate} = C4::Dates->new($num_res->{'reservedate'},'iso')->output('syspref'); + $getreserv{reservedate} = $num_res->{'reservedate'}; foreach (qw(biblionumber title author itemcallnumber )) { $getreserv{$_} = $getiteminfo->{$_}; } @@ -448,10 +447,6 @@ sub build_issue_data { $issuedate = $issue->{issuedate}->clone(); } - $issue->{date_due_sort} = $issue->{date_due}; - $issue->{date_due} = output_pref( $issue->{date_due} ); - $issue->{issuedate_sort} = $issue->{issuedate}; - $issue->{issuedate} = output_pref( $issue->{issuedate} ) if defined $issue->{issuedate}; my $biblionumber = $issue->{biblionumber}; $issue->{issuingbranchname} = GetBranchName($issue->{branchcode}); my %row = %{$issue}; -- 2.39.5