Module: check_mk
Branch: master
Commit: 5cd0f1149784f5fb829b0029581cffd508b8fb96
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cd0f1149784f5…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Sep 24 15:32:35 2012 +0200
FIX: Fixed problem with complaining empty ListOf() valuespecs
---
ChangeLog | 3 +++
web/htdocs/htmllib.py | 7 +++++--
web/htdocs/valuespec.py | 7 +++++--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c6a68c3..3b703ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
Mulitisite
* Added "view" parameter to dashlet_pnpgraph webservice
+ WATO
+ * FIX: Fixed problem with complaining empty ListOf() valuespecs
+
1.2.1i1:
Core:
* Allow to add options to rules. Currently the options "disabled" and
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index cc5a93a..abbec9a 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -303,9 +303,12 @@ class html:
self.write('<br>'.join(self.user_errors.values()))
self.write('</div>\n')
- def hidden_field(self, var, value):
+ def hidden_field(self, var, value, id = None, add_var = False):
if value != None:
- self.write("<input type=hidden name=%s
value=\"%s\">" % (var, attrencode(value)))
+ id = id and ' id="%s"' % id or ''
+ self.write("<input type=hidden name=%s
value=\"%s\"%s>" % (var, attrencode(value), id))
+ if add_var:
+ self.add_form_var(var)
# Beware: call this method just before end_form(). It will
# add all current non-underscored HTML variables as hiddedn
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 0ed7ab5..54bd2ae 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -631,8 +631,11 @@ class ListOf(ValueSpec):
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))
+ html.hidden_field('%s_count' % varprefix,
+ str(len(value)),
+ id = '%s_count' % varprefix,
+ add_var = True
+ )
# Render reference element for cloning
html.write('<table style="display:none"
id="%s_prototype">' % varprefix)