[checkmk-commits] Check_MK Git: check_mk: FIX: fixed box layout with omitted root ( was sometimes invisible)

Module: check_mk Branch: master Commit: 99fa018839fb16af02f795a9b32700703fee40d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99fa018839fb16… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu May 24 11:33:48 2012 +0200 FIX: fixed box layout with omitted root (was sometimes invisible) --- ChangeLog | 1 + web/plugins/views/bi.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b7a508..88ee342 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * New aggregation function count_ok, that counts the number of nodes in state OK. * FIX: Removed debug output int count_ok aggregation + * FIX: fixed box layout with omitted root (was sometimes invisible) Checks & Agents: * AIX: convert NIC check to lnx_if (now being compatible with if/if64) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 12e3738..02070d7 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -310,7 +310,8 @@ def paint_aggr_tree_foldable(row, boxes, omit_root=True): leaf = "noleaf" mc = mousecode - if not omit_root or len(path) > 1: + omit = omit_root and len(path) == 1 + if not omit: h += '<span id="%d:%s" %s class="bibox_box %s %s state%s">' % ( expansion_level, path_id, mc, leaf, is_open and "open" or "closed", state["state"]) if is_leaf: @@ -320,7 +321,7 @@ def paint_aggr_tree_foldable(row, boxes, omit_root=True): h += '</span> ' if not is_leaf: - h += '<span class="bibox" style="%s">' % (not is_open and "display: none;" or "") + h += '<span class="bibox" style="%s">' % ((not is_open and not omit) and "display: none;" or "") parts = [] for node in tree[3]: new_path = path + [node[2]["title"]]