From a6f8e2412d76536ae14bf2c3eba74bb556fee399 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 15 Aug 2019 10:59:46 +0000 Subject: [PATCH] Bug 23409: (follow-up) Allow HTML in circulation note and add line breaks in OPAC user account This patch makes 2 changes: - bug 22702 allowed adding HTML to the circulation note, so this patch restores that ability. - display OPAC note and messages as multi-line in OPAC To test: - Add a circulation and an OPAC note with line breaks and HTML tags to the patron account - Add a message with line breaks to the patron account - Check line breaks don't show on - OPAC > patron account > my summary page - Staff > patron account > details - Apply patches - Repeat test Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson --- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 318cde9a65..8e878368d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -535,7 +535,7 @@ [% IF ( patron.borrowernotes ) %]
  • Circulation note:
    - [% patron.borrowernotes | html | html_line_break %] + [% patron.borrowernotes | $raw | html_line_break %]
  • [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc index 39b6cfd97d..2dbf70dac3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc @@ -4,12 +4,12 @@
      [% FOREACH message IN patron_messages %]
    • - [% message.message | html %]
      + [% message.message | html | html_line_break %]
         Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) | html %]
    • [% END %] - [% IF ( opacnote ) %]
    • [% opacnote | html %]
    • [% END %] + [% IF ( opacnote ) %]
    • [% opacnote | html | html_line_break %]
    • [% END %]
    [% END %] -- 2.39.5