[checkmk-commits] Check_MK Git: check_mk: FIX json export: fixed bug not stripping html tags from output

Module: check_mk Branch: master Commit: 5a950db30e4edd26786a8fe50810bff3a6ee35f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a950db30e4edd… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Fri May 23 16:30:16 2014 +0200 FIX json export: fixed bug not stripping html tags from output --- .werks/923 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/webservice.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/923 b/.werks/923 new file mode 100644 index 0000000..2035111 --- /dev/null +++ b/.werks/923 @@ -0,0 +1,9 @@ +Title: json export: fixed bug not stripping html tags from output +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1400855385 + + diff --git a/ChangeLog b/ChangeLog index 0c9d45e..9ec0dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 0811 FIX: Fixed handling of exceptions occuring before login in debug mode * 0912 FIX: Multisite Views: Fixed bug where custom views could not get deleted * 0921 FIX: dashboards: fixed bug not updating header timestamp... + * 0923 FIX: json export: fixed bug not stripping html tags from output WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index c32e88b..35681b3 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -101,7 +101,7 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox content = str(content) content = content.replace("<br>","\n") stripped = html.strip_tags(content) - html.write(encode_string_json(content)) + html.write(encode_string_json(stripped)) html.write("]") html.write("\n]\n")