From dd98c9df92503885f4f88e4cb6ca4c555fb28ee8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 7 Jan 2016 09:32:28 +0000 Subject: [PATCH] Bug 13618: Fix for debarredcomment and patron messages At the OPAC and intranet. Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../intranet-tmpl/prog/en/includes/borrower_debarments.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index aea088950d..ece447e7d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -51,7 +51,7 @@ Discharge [% END %] - [% d.comment %] + [% d.comment.raw %] [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 92bf41e3a0..633e756dff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -771,7 +771,7 @@ No patron matched [% message %] [% END %] [% IF ( debarredcomment ) %] - with the explanation:
[% debarredcomment | html_line_break %] + with the explanation:
[% debarredcomment.raw | html_line_break %] [% END %]
@@ -846,7 +846,7 @@ No patron matched [% message %] [% lib_messages_loo.message_date_formatted %] [% lib_messages_loo.branchcode %] - "[% lib_messages_loo.message %]" + "[% lib_messages_loo.message.raw %]" [% IF ( lib_messages_loo.can_delete ) %] [Delete] @@ -858,7 +858,7 @@ No patron matched [% message %] [% END %] [% FOREACH bor_messages_loo IN bor_messages_loop %] -
  • [% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] "[% bor_messages_loo.message %]" [% IF ( bor_messages_loo.can_delete ) %][Delete] +
  • [% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] "[% bor_messages_loo.message.raw %]" [% IF ( bor_messages_loo.can_delete ) %][Delete] [% ELSIF ( all_messages_del ) %] [Delete] [% END %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index a5083118fb..d66357f195 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -980,7 +980,7 @@ [% FOREACH d IN debarments %] [% d.type %] - [% d.comment %] + [% d.comment.raw %] [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] 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 d4fd42ec7c..b1a7bee5ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -180,7 +180,7 @@ function validate1(date) { [% END %] [% IF ( debarredcomment ) %] - with the explanation: [% debarredcomment | html_line_break %] + with the explanation: [% debarredcomment.raw | html_line_break %] [% END %] View restrictions diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 4dab3ed58d..28b237efd5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -31,7 +31,7 @@