a0ccc0d246
In a couple of patron searches, the address is displayed.
If the address contain invalid json characters, DataTables won't manage
to parse the results and display them.
This patch makes the templates more readable by creating a BLOCK instead
of a long line and escape the invalid json characters calling the TT
plugin (To.json).
Test plan:
Edit a patron and add something like:
patron <address> \123 ☎ ⚑
in the address field.
Search for this patron using the main patron search (members/member.pl)
and the guarantor search.
Confirm that a result with this patron is correctly displayed.
Regression test: Since Koha::Template::Plugin::To::json is modified,
confirm that the add users to basket search (on acqui/basket.pl?basketno=X
click on the "Add user" button) still works as expected.
Signed-off-by: Christopher Brannon <cbrannon@cdalibary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
44 lines
3 KiB
Text
44 lines
3 KiB
Text
[% USE To %]
|
|
[% USE AuthorisedValues %]
|
|
{
|
|
"sEcho": [% sEcho %],
|
|
"iTotalRecords": [% iTotalRecords %],
|
|
"iTotalDisplayRecords": [% iTotalDisplayRecords %],
|
|
"aaData": [
|
|
[% FOREACH data IN aaData %]
|
|
{
|
|
[% IF CAN_user_tools_manage_patron_lists %]
|
|
"dt_borrowernumber":
|
|
"<input type='checkbox' class='selection' name='borrowernumber' value='[% data.borrowernumber %]' />",
|
|
[% END %]
|
|
"dt_cardnumber":
|
|
"[% data.cardnumber | html %]",
|
|
"dt_name":
|
|
"<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber %]'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 %]</a><br />[% INCLUDE escape_address data = data %]</span>",
|
|
"dt_category":
|
|
"[% data.category_description |html %] ([% data.category_type |html %])",
|
|
"dt_branch":
|
|
"[% data.branchname |html %]",
|
|
"dt_dateexpiry":
|
|
"[% data.dateexpiry %]",
|
|
"dt_od_checkouts":
|
|
"[% IF data.overdues %]<span class='overdue'><strong>[% data.overdues %]</strong></span>[% ELSE %][% data.overdues %][% END %] / [% data.issues %]",
|
|
"dt_fines":
|
|
"[% IF data.fines < 0 %]<span class='credit'>[% data.fines |html %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines |html %]</strong></span> [% ELSE %] [% data.fines |html%] [% END %]</td>",
|
|
"dt_borrowernotes":
|
|
"[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]",
|
|
"dt_action":
|
|
"[% IF data.category_type %]<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]&category_type=[% data.category_type %]'>Edit</a>[% ELSE %][% IF data.categorycode %]<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]&categorycode=[% data.categorycode %]'>Edit</a>[% ELSE %]<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]&category_type=A'>Edit</a>[% END %][% END %]",
|
|
"borrowernumber":
|
|
"[% data.borrowernumber %]"
|
|
}[% UNLESS loop.last %],[% END %]
|
|
[% END %]
|
|
]
|
|
}
|
|
[% BLOCK escape_address %]
|
|
[%~ SET address = data.streetnumber _ ' ' %]
|
|
[%~ IF data.streettype %][% address = address _ AuthorisedValues.GetByCode( 'ROADTYPE', data.streettype ) _ ' ' %][% END %]
|
|
[%~ IF data.address %][% address = address _ data.address _ ' ' %][% END %]
|
|
[%~ IF data.address2 %][% address = address _ data.address2 _ ' ' %][% END %]
|
|
[%~ To.json( address ) | html ~%]
|
|
[% END %]
|