[checkmk-commits] Check_MK Git: check_mk: wato: Processing taglist as string

Module: check_mk Branch: master Commit: 20dc5004a982961230010b6af873eb29baf8a4e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20dc5004a98296… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Jan 13 15:04:46 2012 +0100 wato: Processing taglist as string --- web/htdocs/js/wato.js | 2 +- web/htdocs/wato.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 2979286..677891c 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -87,7 +87,7 @@ function wato_fix_visibility() { var oCheckbox = oTr.childNodes[1].childNodes[0]; if( oCheckbox.checked == false ){ var attrname = oCheckbox.parentNode.parentNode.id; - if(attrname in inherited_tags && inherited_tags[attrname]){ + if(attrname in inherited_tags && inherited_tags[attrname] !== null){ currentTags = currentTags.concat(inherited_tags[attrname].split("|")); } } else { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d404ede..ea67819 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3875,7 +3875,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute inherited_value = container["attributes"][attrname] has_inherited = True if topic == _("Host tags"): - inherited_tags["attr_%s" % attrname] = attr.get_tag_list(inherited_value) + inherited_tags["attr_%s" % attrname] = '|'.join(attr.get_tag_list(inherited_value)) break container = container.get(".parent") @@ -3886,7 +3886,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute inherited_value = attr.default_value() # Also add the default values to the inherited values dict if topic == _("Host tags"): - inherited_tags["attr_%s" % attrname] = attr.get_tag_list(inherited_value) + inherited_tags["attr_%s" % attrname] = '|'.join(attr.get_tag_list(inherited_value)) # Legend and Help html.write('<tr id="attr_%s"><td class=legend>' % attrname)