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>
This commit is contained in:
Nick Clemens 2023-04-28 16:03:07 +00:00 committed by Tomas Cohen Arazi
parent 2608e405de
commit 5b7879ebf8
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
4 changed files with 4 additions and 4 deletions

View file

@ -1284,7 +1284,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>

View file

@ -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>

View file

@ -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>

View file

@ -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>