From f3338a3061b1bf40b9c8b856b27f737273859c0d Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 14 Aug 2013 09:46:03 -0400 Subject: [PATCH] Bug 9011 - QA Followup * Use template plugin to get syspref values * Hide "last returned by" if AnonymousPatron is not set Signed-off-by: Jonathan Druart --- catalogue/moredetail.pl | 1 - .../prog/en/modules/catalogue/moredetail.tt | 3 ++- .../opac-tmpl/prog/en/modules/opac-privacy.tt | 2 +- opac/opac-privacy.pl | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index 0850a0d..a925285 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -212,7 +212,6 @@ $template->param( z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)), subtitle => $subtitle, hidepatronname => $hidepatronname, - StoreLastBorrower => C4::Context->preference('StoreLastBorrower'), ); $template->param(ONLY_ONE => 1) if ( $itemnumber && $showncount != @items ); $template->{'VARS'}->{'searchid'} = $query->param('searchid'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 24e0698..fe203d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -1,3 +1,4 @@ +[% USE Koha %] [% USE KohaBorrowers %] [% INCLUDE 'doc-head-open.inc' %] Koha › Catalog › Item details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %] @@ -213,7 +214,7 @@
  • Last seen:[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %] 
  • Last borrowed:[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] 
  • - [% IF ( StoreLastBorrower && ITEM_DAT.last_returned_by ) %]
  • Last returned by: [% KohaBorrowers.BorrowernumberToCardnumber( ITEM_DAT.last_returned_by ) %] 
  • [% END %] + [% IF ( ITEM_DAT.last_returned_by && Koha.Preference('StoreLastBorrower') && !Koha.Preference('AnonymousPatron') ) %]
  • Last returned by: [% KohaBorrowers.BorrowernumberToCardnumber( ITEM_DAT.last_returned_by ) %] 
  • [% END %] [% IF ( ITEM_DAT.card0 ) %]
  • Last borrower: [% ITEM_DAT.card0 %] 
  • [% END %] [% IF ( ITEM_DAT.card1 ) %]
  • Previous borrower: [% ITEM_DAT.card1 %] 
  • [% END %] [% IF ( ITEM_DAT.card2 ) %]
  • Previous borrower: [% ITEM_DAT.card2 %] 
  • [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt index 5e7c716..f4e4c86 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt @@ -63,7 +63,7 @@ [% END %] - [% IF StoreLastBorrower %]

    Please note, the last person to return an item is tracked for the management of items returned damaged.

    [% END %] + [% IF Koha.Preference('StoreLastBorrower') %]

    Please note, the last person to return an item is tracked for the management of items returned damaged.

    [% END %] diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl index 5905447..22fe694 100755 --- a/opac/opac-privacy.pl +++ b/opac/opac-privacy.pl @@ -68,7 +68,6 @@ $template->param( 'Ask_data' => '1', 'firstname' => $borr->{'firstname'}, 'surname' => $borr->{'surname'}, 'privacyview' => 1, - 'StoreLastBorrower' => C4::Context->preference('StoreLastBorrower'), ); output_html_with_http_headers $query, $cookie, $template->output; -- 1.7.2.5