From 640a6d2cd491ebfc0b496963960b3d5d0f527ac6 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 12 Aug 2016 08:29:42 +0200 Subject: [PATCH] Bug 17109: Use Koha.Preference in sendbasket template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need to send OPACBaseURL to the template, if you load the Koha TT plugin inside the template. Test plan: Send a few items in your cart from OPAC and intranet. Signed-off-by: Marc VĂ©ron --- basket/sendbasket.pl | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt | 6 ++++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt | 6 ++++-- opac/opac-sendbasket.pl | 3 +-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index 802ca33..f54caba 100755 --- a/basket/sendbasket.pl +++ b/basket/sendbasket.pl @@ -68,11 +68,10 @@ if( $csrf_err ) { my $comment = $query->param('comment'); # Since we are already logged in, no need to check credentials again - # We only need to add OPACBaseURL + # when loading a second template. my $template2 = C4::Templates::gettemplate( 'basket/sendbasket.tt', 'intranet', $query, ); - $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') ); my @bibs = split( /\//, $bib_list ); my @results; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt index adb47cd..68e735c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt @@ -1,9 +1,10 @@ +[% USE HtmlToText %] +[% USE Koha %] + Your cart -[% USE HtmlToText %] -
[% FILTER html2text %] @@ -130,6 +131,7 @@ Your cart [% END %]

+ [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %]

In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt index 7c7978f..47d03f1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt @@ -1,9 +1,10 @@ +[% USE HtmlToText %] +[% USE Koha %] + Your cart -[% USE HtmlToText %] -

[% FILTER html2text %] @@ -130,6 +131,7 @@ Your cart [% END %]

+ [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %]

In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index b1f6f3e..6b9ba43 100755 --- a/opac/opac-sendbasket.pl +++ b/opac/opac-sendbasket.pl @@ -81,11 +81,10 @@ if( $csrf_err ) { $mail{'X-Abuse-Report'} = C4::Context->preference('KohaAdminEmailAddress'); # Since we are already logged in, no need to check credentials again - # We only need to add OPACBaseURL + # when loading a second template. my $template2 = C4::Templates::gettemplate( 'opac-sendbasket.tt', 'opac', $query, ); - $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') ); my @bibs = split( /\//, $bib_list ); my @results; -- 2.1.4