Bugzilla – Attachment 101387 Details for
Bug 23409
Show circulation note and OPAC note with line feeds
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23409: (follow-up) Allow HTML in circulation note and add line breaks in OPAC user account
Bug-23409-follow-up-Allow-HTML-in-circulation-note.patch (text/plain), 2.97 KB, created by
Katrin Fischer
on 2020-03-22 17:52:28 UTC
(
hide
)
Description:
Bug 23409: (follow-up) Allow HTML in circulation note and add line breaks in OPAC user account
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2020-03-22 17:52:28 UTC
Size:
2.97 KB
patch
obsolete
>From 98dc273338f4acd2ef4739ba80636f297eee9165 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Thu, 15 Aug 2019 10:59:46 +0000 >Subject: [PATCH] Bug 23409: (follow-up) Allow HTML in circulation note and add > line breaks in OPAC user account > >This patch makes 2 changes: >- bug 22702 allowed adding HTML to the circulation note, so this patch > restores that ability. >- display OPAC note and messages as multi-line in OPAC > >To test: >- Add a circulation and an OPAC note with line breaks and HTML tags > to the patron account >- Add a message with line breaks to the patron account >- Check line breaks don't show on > - OPAC > patron account > my summary page > - Staff > patron account > details >- Apply patches >- Repeat test > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Notes and messages show line breaks in OPAC, Notes on staff >HTML tags are processed in circulation notes >No errors > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 36b95928ec..916ac9749c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -536,7 +536,7 @@ > [% IF ( patron.borrowernotes ) %] > <li id="patron-borrowernotes"> > <span class="label">Circulation note: </span><br /> >- [% patron.borrowernotes | html | html_line_break %] >+ [% patron.borrowernotes | $raw | html_line_break %] > </li> > [% END %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc >index 39b6cfd97d..2dbf70dac3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc >@@ -4,12 +4,12 @@ > <ul> > [% FOREACH message IN patron_messages %] > <li> >- <strong>[% message.message | html %]</strong><br> >+ <strong>[% message.message | html | html_line_break %]</strong><br> > <i>Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) | html %]</i> > </li> > [% END %] > >- [% IF ( opacnote ) %]<li>[% opacnote | html %]</li>[% END %] >+ [% IF ( opacnote ) %]<li>[% opacnote | html | html_line_break %]</li>[% END %] > </ul> > </div> > [% END %] >-- >2.11.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 23409
:
91905
|
91906
|
92172
|
92173
|
92246
|
92247
|
99712
|
99713
|
101386
| 101387