gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
This commit is contained in:
Katrin Fischer 2019-08-15 10:59:46 +00:00 committed by Joy Nelson
parent cdc1ae5aea
commit a6f8e2412d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
View File

@ -535,7 +535,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 %]

4
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
View File

@ -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>
&nbsp;&nbsp;&nbsp;<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 %]