Bugzilla – Attachment 182628 Details for
Bug 23978
Notes field in saved reports should allow for (scrubbed) HTML
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23978: (QA follow-up) Use html_scrubber
Bug-23978-QA-follow-up-Use-htmlscrubber.patch (text/plain), 4.62 KB, created by
Martin Renvoize (ashimema)
on 2025-05-19 15:51:41 UTC
(
hide
)
Description:
Bug 23978: (QA follow-up) Use html_scrubber
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2025-05-19 15:51:41 UTC
Size:
4.62 KB
patch
obsolete
>From fe98beef015dc4839a2e6bbc6f4fc36c3f1c1eaa Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@openfifth.co.uk> >Date: Mon, 19 May 2025 16:49:00 +0100 >Subject: [PATCH] Bug 23978: (QA follow-up) Use html_scrubber > >This followup replaces the $raw filter with `scrub_html type => 'note' | >$raw`. >--- > .../en/modules/reports/guided_reports_start.tt | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index c5d7536b572..880c7a7f5fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -4,6 +4,7 @@ > [% USE KohaDates %] > [% USE Koha %] > [% USE TablesSettings %] >+[% USE HtmlScrubber %] > [% USE JSON.Escape %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >@@ -849,7 +850,7 @@ > <input type="hidden" name="reportname" value="[% reportname | html %]" /> > <input type="hidden" name="group" value="[% group | html %]" /> > <input type="hidden" name="subgroup" value="[% subgroup | html %]" /> >- <input type="hidden" name="notes" value="[% notes | $raw %]" /> >+ <input type="hidden" name="notes" value="[% notes | scrub_html type => 'note' | $raw %]" /> > <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> > <input type="hidden" name="cache_expiry_units" value="[% cache_expiry_units | html %]" /> > <input type="hidden" name="public" value="[% public | html %]" /> >@@ -883,7 +884,7 @@ > <input type="hidden" name="id" value="[% id | html %]" /> > <h1>Enter parameters for report [% name | html %]:</h1> > [% IF ( notes ) %] >- <p>[% notes | $raw %]</p> >+ <p>[% notes | scrub_html type => 'note' | $raw %]</p> > [% END %] > <fieldset class="rows"> > <ol> >@@ -943,7 +944,7 @@ > > > <div class="page-section"> > [% IF ( notes ) %] >- <p><span class="label">Notes:</span> [% notes | $raw %]</p> >+ <p><span class="label">Notes:</span> [% notes | scrub_html type => 'note' | $raw %]</p> > [% END %] > [% IF ( unlimited_total ) %] > <p> >@@ -1415,7 +1416,7 @@ > [% END # /IF (usecache) %] > <li> > <label for="notes">Notes:</label> >- <textarea id="notes" name="notes" cols="50" rows="2">[% notes | $raw %]</textarea> >+ <textarea id="notes" name="notes" cols="50" rows="2">[% notes | scrub_html type => 'note' | $raw %]</textarea> > </li> > </ol> > </fieldset> >@@ -1445,7 +1446,7 @@ > [% IF saved_results %] > <h1>Saved report results</h1> > <h2>[% name | html %]</h2> >- <p>[% notes | $raw %]</p> >+ <p>[% notes | scrub_html type => 'note' | $raw %]</p> > <table> > [% FOREACH rows IN saved_results %] > <tr> >@@ -1465,7 +1466,7 @@ > [% IF ( notes ) %] > <li> > <span class="label">Notes:</span> >- [% notes | $raw %] >+ [% notes | scrub_html type => 'note' | $raw %] > </li> > [% ELSE %] > >@@ -1533,7 +1534,7 @@ > [% END %] > <li> > <label for="notes">Notes:</label> >- <textarea id="notes" name="notes" cols="50" rows="2">[% notes | $raw %]</textarea> >+ <textarea id="notes" name="notes" cols="50" rows="2">[% notes | scrub_html type => 'note' | $raw %]</textarea> > </li> > </ol> > </fieldset> >-- >2.49.0
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 23978
:
95107
|
95108
|
161711
|
182627
|
182628
|
182642
|
182643
|
182644