[checkmk-commits] Check_MK Git: check_mk: ValueSpec ListOf: fixed complaining

Module: check_mk Branch: master Commit: a539e10bcdd339564563fe8a7836e5d2d97e46f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a539e10bcdd339… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Sep 12 10:01:08 2012 +0200 ValueSpec ListOf: fixed complaining --- ChangeLog | 2 ++ web/htdocs/valuespec.py | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16248b1..41b4198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,8 @@ * FIX: Fixed double hook execution when using localized multisite * FIX: User list shows names of contactgroups when no alias given * FIX: Remove also user settings and event console rule on factory reset + * FIX: complex list widgets (ListOf) failed back to old value when + complaining BI: * Great speed up of rule compilation in large environments diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 85b7590..afff6b0 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -592,6 +592,13 @@ class ListOf(ValueSpec): # numbering in labels, etc. possible). The current number # of entries is stored in the hidden variable 'varprefix' def render_input(self, varprefix, value): + + # In the 'complain' phase, where the user already saved the + # form but the validation failed, we must not display the + # original 'value' but take the value from the HTML variables. + if html.has_var("%s_count" % varprefix): + value = self.from_html_vars(varprefix) + html.write('<input type=hidden name="%s_count" value="%d" id="%s_count">\n' % (varprefix, len(value), varprefix))