Module: check_mk
Branch: master
Commit: 82dd86fc378a4598aaf5e8cc6ca2367f513eee8e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82dd86fc378a45…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Jun 22 16:33:54 2016 +0200
Better error handling in forms.edit_dictionary
---
web/htdocs/forms.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py
index c14cb19..3a1e26b 100644
--- a/web/htdocs/forms.py
+++ b/web/htdocs/forms.py
@@ -109,10 +109,11 @@ def edit_dictionaries(dictionaries, value, focus=None,
hover_help=True,
html.add_user_error(e.varname, e)
if messages:
+ messages_joined = "".join(["%s<br>\n" % m for m in
messages])
if not preview:
- html.show_error("".join(["%s<br>\n" % m for m
in messages]))
+ html.show_error(messages_joined)
else:
- return None
+ raise MKUserError(None, messages_joined)
else:
return new_value