From a53d1a733cad6595e142498fef9132f0d2715144 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 7 Jun 2018 12:17:26 -0300 Subject: [PATCH] Bug 20891: Escape list's names in JSON When someone uses \ in the description of a list, the datatable in staff won't load and keeps processing. Test plan: - Create a list named "" - Create another list named "k\o\h\a" - Hit /cgi-bin/koha/virtualshelves/shelves.pl => Without this patch the lists will not be displayed, JSON is malformated => With this patch everything is ok Signed-off-by: Marcel de Rooy Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 2be0195895628ec491ee1f25368e60181c4f1eb2) Signed-off-by: Martin Renvoize (cherry picked from commit 05ffb6c6af451aa764f0cb4be1d712d7334f1167) Signed-off-by: Lucas Gass --- .../prog/en/modules/virtualshelves/tables/shelves_results.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt index 2593a7a783..13317ee7ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt @@ -10,13 +10,13 @@ "dt_type": "[% data.type %]", "dt_shelfname": - "[% data.shelfname | html%]", + "[% To.json(data.shelfname) | html%]", "dt_count": "[% data.count %] item(s)", "dt_is_shared": "[% IF data.type == 2 %]Public[% ELSIF data.is_shared %]Shared[% ELSE %]Private[% END %]", "dt_owner": - "[% data.firstname %] [% data.surname %]", + "[% To.json(data.firstname) | html %] [% To.json(data.surname) | html %]", "dt_sortby": [% IF data.sortby == "author" %]"Author"[% ELSIF data.sortby == "copyrightdate" %]"Year"[% ELSIF data.sortby == "itemcallnumber" %]"Call number"[% ELSE %]"Title"[% END %], "dt_created_on": -- 2.39.5