From 905f637252851f7aca24dc39df1d8d08a3f6d18f Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Wed, 24 Apr 2013 10:31:19 +0200
Subject: [PATCH] Bug 9903: Followup: use the KohaDates T::T plugin to display
dates.
---
.../intranet-tmpl/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 8bb96c3..0b23a74 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 %]
<td>
[% END %]
- <span title="[% issueloo.date_due_sort %]">[% issueloo.date_due %]</span>
+ <span title="[% issueloo.date_due %]">[% issueloo.date_due | $KohaDates %]</span>
[% IF ( issueloo.itemlost ) %]
<span class="lost">[% issueloo.itemlost %]</span>
[% END %]
@@ -484,7 +484,7 @@ function validate1(date) {
</td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issueloo.biblionumber %]"><strong>[% issueloo.title |html %]</strong></a>[% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issueloo.biblionumber %]&itemnumber=[% issueloo.itemnumber %]#item[% issueloo.itemnumber %]">[% issueloo.barcode %]</a></td>
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
- <td><span title="[% issueloo.issuedate_sort %]">[% issueloo.issuedate %]</span></td>
+ <td><span title="[% issueloo.issuedate %]">[% issueloo.issuedate | $KohaDates%]</span></td>
<td>[% issueloo.issuingbranchname %]</td>
<td>[% issueloo.itemcallnumber %]</td>
<td>[% issueloo.charge %]</td>
@@ -582,7 +582,7 @@ function validate1(date) {
[% ELSE %]
<td>
[% END %]
- <span title="[% relissueloo.date_due_sort %]">[% relissueloo.date_due %]</span>
+ <span title="[% relissueloo.date_due %]">[% relissueloo.date_due | $KohaDates %]</span>
[% IF ( relissueloo.itemlost ) %]
<span class="lost">[% relissueloo.itemlost %]</span>
[% END %]
@@ -592,7 +592,7 @@ function validate1(date) {
</td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
- <td><span title="[% relissueloo.issuedate_sort %]">[% relissueloo.issuedate %]</span></td>
+ <td><span title="[% relissueloo.issuedate %]">[% relissueloo.issuedate | $KohaDates %]</span></td>
<td>[% relissueloo.issuingbranchname %]</td>
<td>[% relissueloo.itemcallnumber %]</td>
<td>[% relissueloo.charge %]</td>
@@ -630,7 +630,7 @@ function validate1(date) {
</tr></thead>
<tbody>[% FOREACH reservloo IN reservloop %]
<tr class="[% reservloo.color %]">
- <td><span title="[% reservloo.reservedate_sort %]">[% reservloo.reservedate %]</span></td>
+ <td><span title="[% reservloo.reservedate %]">[% reservloo.reservedate | $KohaDates %]</span></td>
<td>
<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]">[% reservloo.title |html %]</a>[% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]
</td>
diff --git a/members/moremember.pl b/members/moremember.pl
index 52da918..2e5c66a 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};
--
1.7.10.4