From 80fe28b3cded6407494252993a402da2c39a7a05 Mon Sep 17 00:00:00 2001 From: Andreas Boesl Date: Fri, 23 May 2014 16:30:16 +0200 Subject: [PATCH] FIX json export: fixed bug not stripping html tags from output --- .werks/923 | 8 ++++++++ ChangeLog | 1 + web/plugins/views/webservice.py | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .werks/923 diff --git a/.werks/923 b/.werks/923 new file mode 100644 index 0000000000000..cfa167568503f --- /dev/null +++ b/.werks/923 @@ -0,0 +1,8 @@ +Title: json export: fixed bug not stripping html tags from output +Level: 2 +Component: multisite +Version: 1.2.4p3 +Date: 1400855385 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 074f8b771102f..886793f5b160c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Multisite: * 0912 FIX: Multisite Views: Fixed bug where custom views could not get deleted + * 0923 FIX: json export: fixed bug not stripping html tags from output WATO: * 0971 FIX: Fix missing authentication of PHP addons in D-WATO when activation mode is reload... diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index cbc9a1dfa0032..2d5c6f2a1bda2 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -99,7 +99,7 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox content = str(content) content = content.replace("
","\n") stripped = html.strip_tags(content) - html.write(encode_string_json(content)) + html.write(encode_string_json(stripped)) html.write("]") html.write("\n]\n")