From 002cb4d7782c96ce11accaf27087dcf42e045517 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 9 Oct 2018 12:22:35 +0000 Subject: [PATCH] Bug 21552: Use raw filter for displaying RoutingListNote The RoutingListNote system preference works like other prefs allowing you to insert your own content on the routling list template using HTML. The default text even uses HTML, so it looks broken without this patch. To test: - Add a subscription - Add a new routing list to it - Add some patrons to it - Save - preview routing list - Verify that the note shows and is formatted correctly. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Chris Cormack --- .../prog/en/modules/serials/routing-preview-slip.tt | 4 +++- serials/routing-preview.pl | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt index 98f7548489..9caefcca57 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt @@ -1,3 +1,5 @@ +[% USE Koha %] +[% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › Routing slip preview @@ -30,7 +32,7 @@
-

[% generalroutingnote | html %]

+

[% Koha.Preference('RoutingListNote') | $raw %]

[% routingnotes | html %]

diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl index 015005c80e..85fc784aff 100755 --- a/serials/routing-preview.pl +++ b/serials/routing-preview.pl @@ -137,7 +137,6 @@ $template->param( subscriptionid => $subscriptionid, memberloop => $memberloop, routingnotes => $routingnotes, - generalroutingnote => C4::Context->preference('RoutingListNote'), hasRouting => check_routing($subscriptionid), (uc(C4::Context->preference("marcflavour"))) => 1 ); -- 2.19.1