[checkmk-commits] Check_MK Git: check_mk: Removed two uneeded table headers from WATO host table

Module: check_mk Branch: master Commit: 7e3be87b46be3136aea5b46a136f004b1a89154d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e3be87b46be31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 14:03:31 2014 +0100 Removed two uneeded table headers from WATO host table --- web/htdocs/table.py | 2 ++ web/htdocs/wato.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index c0fbdb4..c8ca35a 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -99,6 +99,8 @@ def add_row(css=None, state=0, collect_headers=True, fixed=False): table["collect_headers"] = True elif table["collect_headers"] == True: table["collect_headers"] = "finished" + elif not collect_headers and table["collect_headers"]: + table["collect_headers"] = False # Intermediate title, shown as soon as there is a following row. # We store the group headers in the list of rows, with css None diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c411961..fa121bf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1388,7 +1388,7 @@ def show_hosts(folder): for attr, topic in host_attributes: if attr.show_in_table(): colspan += 1 - if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): + if not g_folder.get(".lock_hosts") and config.may("wato.edit_hosts") and config.may("wato.move_hosts"): colspan += 1 if show_checkboxes: colspan += 1