[checkmk-commits] Check_MK Git: check_mk: Better error message for regex errors

Module: check_mk Branch: master Commit: eb5961175c2b0d99126a4a2d5017b313ccef645d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb5961175c2b0d… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Jan 18 13:05:02 2012 +0100 Better error message for regex errors --- web/htdocs/forms.py | 4 ++-- web/htdocs/valuespec.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 8775414..9df5239 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -29,7 +29,7 @@ from lib import * def edit_dictionary(entries, value, focus=None, hover_help=True): new_value = value.copy() - if html.check_transaction(): + if html.var("filled_in") == "form" and html.check_transaction(): messages = [] for name, vs in entries: try: @@ -37,7 +37,7 @@ def edit_dictionary(entries, value, focus=None, hover_help=True): vs.validate_value(v, name) new_value[name] = v except MKUserError, e: - messages.append(vs.title() + ": " + e.message) + messages.append(u"%s: %s" % (vs.title(), e.message)) html.add_user_error(e.varname, e.message) if messages: html.show_error("".join(["%s<br>\n" % m for m in messages])) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4edad63..fe7907f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -265,6 +265,8 @@ class TextAscii(ValueSpec): self._size = kwargs.get("size", 30) self._allow_empty = kwargs.get("allow_empty", True) self._regex = kwargs.get("regex") + self._regex_error = kwargs.get("regex_error", + _("Your input odes not match the required format.")) if type(self._regex) == str: self._regex = re.compile(self._regex) @@ -289,7 +291,7 @@ class TextAscii(ValueSpec): raise MKUserError(varprefix, _("An empty value is not allowed here.")) if value and self._regex: if not self._regex.match(value): - raise MKUserError(varprefix, _("Your input odes not match the required format.")) + raise MKUserError(varprefix, self._regex_error) class EmailAddress(TextAscii):