Bugzilla – Attachment 8580 Details for
Bug 7743
Use KohaDates TT plugin in OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 7743: Update opac-readingrecord.pl to use KohaDates TT plugin
SIGNED-OFF-Bug-7743-Update-opac-readingrecordpl-to.patch (text/plain), 3.56 KB, created by
Marijana Glavica
on 2012-03-23 10:44:36 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 7743: Update opac-readingrecord.pl to use KohaDates TT plugin
Filename:
MIME Type:
Creator:
Marijana Glavica
Created:
2012-03-23 10:44:36 UTC
Size:
3.56 KB
patch
obsolete
>From c424004fc48fb85a18d53267fa7398f08d3dbd0b Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Mon, 19 Mar 2012 15:18:27 +0100 >Subject: [PATCH] [SIGNED-OFF] Bug 7743: Update opac-readingrecord.pl to use KohaDates TT plugin > >Signed-off-by: Marijana Glavica <mglavica@ffzg.hr> > >fixed conflict >--- > .../prog/en/modules/opac-readingrecord.tt | 4 +++- > opac/opac-detail.pl | 2 -- > opac/opac-readingrecord.pl | 4 ++-- > opac/opac-user.pl | 1 - > 4 files changed, 5 insertions(+), 6 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt >index fc5be4c..5941369 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt >@@ -1,3 +1,5 @@ >+[% USE KohaDates %] >+ > [% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog › Your checkout history > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css">ul.ui-tabs-nav li a, ul.ui-tabs-nav li span.a { padding:0.6em 1em; }</style> >@@ -82,7 +84,7 @@ You have never borrowed anything from this library. > </span></td> > <td>[% UNLESS ( noItemTypeImages ) %][% IF ( READING_RECOR.imageurl ) %]<img src="[% READING_RECOR.imageurl %]" alt="" />[% END %][% END %] [% READING_RECOR.description %]</td> > <td>[% READING_RECOR.itemcallnumber %]</td> >-<td>[% IF ( READING_RECOR.returndate ) %][% READING_RECOR.returndate %][% ELSE %]<em>(Checked out)</em>[% END %]</td> >+<td>[% IF ( READING_RECOR.returndate ) %][% READING_RECOR.returndate | $KohaDates %][% ELSE %]<em>(Checked out)</em>[% END %]</td> > </tr> > > [% END %] >diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl >index 2134cdd..ef08206 100755 >--- a/opac/opac-detail.pl >+++ b/opac/opac-detail.pl >@@ -494,8 +494,6 @@ for my $itm (@items) { > # I can't actually find any case in which this is defined. --amoore 2008-12-09 > $itm->{ $itm->{'publictype'} } = 1; > } >- $itm->{datedue} = format_sqlduedatetime($itm->{datedue}); >- $itm->{datelastseen} = format_date($itm->{datelastseen}); > > # get collection code description, too > if ( my $ccode = $itm->{'ccode'} ) { >diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl >index 6872660..04c3293 100755 >--- a/opac/opac-readingrecord.pl >+++ b/opac/opac-readingrecord.pl >@@ -89,8 +89,8 @@ foreach my $issue (@{$issues} ) { > $line{title} = $issue->{'title'}; > $line{author} = $issue->{'author'}; > $line{itemcallnumber} = $issue->{'itemcallnumber'}; >- $line{date_due} = format_sqlduedatetime( $issue->{date_due} ); >- $line{returndate} = format_sqldatetime( $issue->{returndate} ); >+ $line{date_due} = $issue->{'date_due'}; >+ $line{returndate} = $issue->{'returndate'}; > $line{volumeddesc} = $issue->{'volumeddesc'}; > $issue->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $issue->{'itype'} : $issue->{'itemtype'}; > if($issue->{'itemtype'}) { >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 78b155c..b89e862 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -197,7 +197,6 @@ if ($issues){ > $issue->{'imageurl'} = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} ); > $issue->{'description'} = $itemtypes->{$itemtype}->{'description'}; > } >- $issue->{date_due} = output_pref_due($issue->{date_due}); > push @issuedat, $issue; > $count++; > >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7743
:
8281
|
8282
|
8283
|
8284
|
8285
|
8286
|
8287
|
8288
|
8573
|
8574
|
8575
|
8576
|
8577
|
8578
|
8579
|
8580
|
8624
|
9038
|
9041