[checkmk-commits] Check_MK Git: check_mk: Fix two bugs in ValueSpec:validate_datatype

Module: check_mk Branch: master Commit: 615ebcd9c87a5428edeb0105e00d47f59463c032 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=615ebcd9c87a54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 14:53:53 2012 +0200 Fix two bugs in ValueSpec:validate_datatype --- web/htdocs/valuespec.py | 4 ++-- web/htdocs/wato.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 28e9325..3898041 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -634,8 +634,8 @@ class ListOf(ValueSpec): return value def validate_datatype(self, value, varprefix): - if type(self) != list: - raise MKUserError(varprefx, _("The type must be list, but is %s") % type(value)) + if type(value) != list: + raise MKUserError(varprefix, _("The type must be list, but is %r") % type(value)) for n, v in enumerate(value): self._valuespec.validate_datatype(v, varprefix + "_%d" % (n+1)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 713f4f4..a0a2eb0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9436,7 +9436,7 @@ def mode_edit_ruleset(phase): except: try: reason = "" - rulespec["valuespec"].validate_datatype(None, value) + rulespec["valuespec"].validate_datatype(value, "") except Exception, e: reason = str(e) @@ -9821,9 +9821,11 @@ def mode_edit_rule(phase): value = rule[0] forms.section() try: - valuespec.validate_datatype("ve", value) + valuespec.validate_datatype(value, "ve") valuespec.render_input("ve", value) except: + if config.debug: + raise valuespec.render_input("ve", valuespec.default_value()) valuespec.set_focus("ve")