Bugzilla – Attachment 150396 Details for
Bug 25379
HTML in circulation notes doesn't show correctly on checkin
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25379: (QA follow-up) Adjust other occurrences and add line break
Bug-25379-QA-follow-up-Adjust-other-occurrences-an.patch (text/plain), 5.54 KB, created by
Nick Clemens (kidclamp)
on 2023-04-28 16:08:57 UTC
(
hide
)
Description:
Bug 25379: (QA follow-up) Adjust other occurrences and add line break
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2023-04-28 16:08:57 UTC
Size:
5.54 KB
patch
obsolete
>From 2bf0b459300680b0e69525cb0c929092a17917b6 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> >--- > 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 7c67dd2f38..f349106343 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -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> >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 3461e6fb9d..cfcd7c5ec2 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 fdd054868a..fe65a405ca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -280,7 +280,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.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25379
:
104375
|
148387
|
148496
|
150395
| 150396