From f1adfe708afe59afa380e0e89767ee9039ec330a Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 28 Apr 2023 16:03:07 +0000 Subject: [PATCH] Bug 25379: (QA follow-up) Adjust other occurrences and add line break This updates the other occurrences and adds html_line_break to all except the edit page - it seems html or raw doesn't affect the value of the textarea, but moved to raw for consistency To test: 1 - Add an HTML note to a patron, make sure to add a line break:

Testing

Newline

2 - Checkout to patron and return 3 - Confirm note shows correctly 4 - Add patron to a list 5 - Confirm note displays correctly 6 - Edit patron, confirm note field is correct 7 - Batch modify borrower 8 - Confirm note displays correctly in batch list Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 5b7879ebf8a571d26d7d0c859f85684044dc3193) Signed-off-by: Matt Blenkinsop --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index e48f21f7fc..fa6554c965 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1283,7 +1283,7 @@ [% IF ( riloo.patron.borrowernotes ) %] -

[% riloo.patron.borrowernotes | $raw %]

+

[% riloo.patron.borrowernotes | $raw | html_line_break %]

[% END %] [% IF ( riloo.itemnote ) %]

[% riloo.itemnote | html %]

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 89132184ba..75ea82f9ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1149,7 +1149,7 @@ legend:hover { [% END %] Circulation note: - +
This message displays when checking out to this patron
[% IF ( mandatoryborrowernotes ) %] Required diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt index f51e614410..bd4ce14fb6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt @@ -202,7 +202,7 @@ [% p.borrowernumber.categorycode.description | html %] ([% p.borrowernumber.categorycode.categorycode | html %]) [% p.borrowernumber.branchcode.branchname | html %] [% p.borrowernumber.dateexpiry | $KohaDates %] - [% p.borrowernumber.borrowernotes | html %] + [% p.borrowernumber.borrowernotes | $raw | html_line_break %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt index 1e75cce019..7289c48a22 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -275,7 +275,7 @@ Never [% END %] [% END %] - [% borrower.borrowernotes | html %] + [% borrower.borrowernotes | $raw | html_line_break %] [% borrower.opacnote | html %] [% borrower.debarred | $KohaDates %] [% borrower.debarredcomment | html %] -- 2.39.5