From f1adfe708afe59afa380e0e89767ee9039ec330a Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
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:
<h1>Testing</h1>
<h2>Newline</h2>
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 <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5b7879ebf8a571d26d7d0c859f85684044dc3193)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 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 @@
                                             </td>
                                             <td class="ci-note">
                                                 [% IF ( riloo.patron.borrowernotes ) %]
-                                                    <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | $raw %]</span></p>
+                                                    <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | $raw | html_line_break %]</span></p>
                                                 [% END %]
                                                 [% IF ( riloo.itemnote ) %]
                                                     <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</span></p>
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:
                                                     </label>
-                                                    <textarea id="borrowernotes" name="borrowernotes" cols="55" rows="5">[% borrower_data.borrowernotes | html UNLESS opduplicate %]</textarea>
+                                                    <textarea id="borrowernotes" name="borrowernotes" cols="55" rows="5">[% borrower_data.borrowernotes | $raw UNLESS opduplicate %]</textarea>
                                                     <div class="hint">This message displays when checking out to this patron</div>
                                                     [% IF ( mandatoryborrowernotes ) %]
                                                         <span class="required">Required</span>
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 @@
                                 <td>[% p.borrowernumber.categorycode.description | html %] ([% p.borrowernumber.categorycode.categorycode | html %])</td>
                                 <td>[% p.borrowernumber.branchcode.branchname | html %]</td>
                                 <td data-order="[% p.borrowernumber.dateexpiry | html %]">[% p.borrowernumber.dateexpiry | $KohaDates %]</td>
-                                <td>[% p.borrowernumber.borrowernotes | html %]</td>
+                                <td>[% p.borrowernumber.borrowernotes | $raw | html_line_break %]</td>
                             </tr>
                         [% END %]
                     </tbody>
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 @@
                                                             <td data-order="9999-99-99">Never</td>
                                                         [% END %]
                                                     [% END %]
-                                                    <td>[% borrower.borrowernotes | html %]</td>
+                                                    <td>[% borrower.borrowernotes | $raw | html_line_break %]</td>
                                                     <td>[% borrower.opacnote | html %]</td>
                                                     <td data-order="[% borrower.debarred | html %]">[% borrower.debarred | $KohaDates %]</td>
                                                     <td>[% borrower.debarredcomment | html %]</td>
-- 
2.39.5