[checkmk-commits] 3363 FIX Exceptions in WATO Web-API are now rendered as plain text messages

Module: check_mk Branch: master Commit: 2a9afa21d80092a29fd2d8bc0ef9453ebd03a16e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a9afa21d80092… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 11:08:41 2016 +0200 3363 FIX Exceptions in WATO Web-API are now rendered as plain text messages --- .werks/3363 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/index.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3363 b/.werks/3363 new file mode 100644 index 0000000..cb0e632 --- /dev/null +++ b/.werks/3363 @@ -0,0 +1,10 @@ +Title: Exceptions in WATO Web-API are now rendered as plain text messages +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459933673 + + diff --git a/ChangeLog b/ChangeLog index 811e81c..3f75f3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -216,6 +216,7 @@ * 3359 FIX: Fixed exception when trying to edit non existant host... * 3361 FIX: Event Console files not synced to remote site nor backed up with WATO snapshot * 3362 FIX: Fixed reload of Event Console in distributed monitoring slave site + * 3363 FIX: Exceptions in WATO Web-API are now rendered as plain text messages Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/index.py b/web/htdocs/index.py index b65c788..8a4f383 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -203,7 +203,7 @@ def fail_silently(): # Webservice functions may decide to get a normal result code # but a text with an error message in case of an error def plain_error(): - return html.has_var("_plain_error") + return html.has_var("_plain_error") or html.myfile == "webapi" def page_not_found():