[checkmk-commits] Check_MK Git: check_mk: Fixed two bug with "hostgroup summary" views ( broken links, unable to edit)

Module: check_mk Branch: master Commit: 94cf55756f3cb85b8ede7ff11fe13f6ef504d732 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94cf55756f3cb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 30 14:04:12 2014 +0100 Fixed two bug with "hostgroup summary" views (broken links, unable to edit) --- web/plugins/views/builtin.py | 2 +- web/plugins/views/datasources.py | 4 ++-- web/plugins/visuals/filters.py | 2 +- web/plugins/visuals/infos.py | 11 ++++++++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 1dd6022..726ff0c 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -804,7 +804,7 @@ multisite_builtin_views.update({ 'title': _('Problems of host')}, 'hostgroup': {'browser_reload': 30, 'column_headers': 'off', - 'datasource': 'hosts', + 'datasource': 'hostsbygroup', 'description': _('All hostgroups including number of hosts in the different states.'), 'group_painters': [('site_icon', None), ('sitealias', 'sitehosts')], diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 61e85ff..65dfb23 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -121,7 +121,7 @@ multisite_datasources["servicesbyhostgroup"] = { multisite_datasources["hostgroups"] = { "title" : _("Hostgroups"), "table" : "hostgroups", - "infos" : [ "hostgroup", "hostgroups" ], + "infos" : [ "hostgroup", "hostgroup_summary" ], "keys" : [ "hostgroup_name" ], "idkeys" : [ "site", "hostgroup_name" ], } @@ -130,7 +130,7 @@ multisite_datasources["merged_hostgroups"] = { "title" : _("Hostgroups, merged"), "table" : "hostgroups", "merge_by" : "hostgroup_name", - "infos" : [ "hostgroup" ], + "infos" : [ "hostgroup", "hostgroup_summary" ], "keys" : [ "hostgroup_name" ], "idkeys" : [ "hostgroup_name" ], } diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index ee505fa..3a289c9 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -56,7 +56,7 @@ class FilterText(Filter): class FilterHostgroupVisibility(Filter): def __init__(self, name, title): - Filter.__init__(self, name, title, "hostgroups", [ "hostgroupshowempty" ], []) + Filter.__init__(self, name, title, "hostgroup_summary", [ "hostgroupshowempty" ], []) def display(self): html.checkbox("hostgroupshowempty", False, label="Show empty groups") diff --git a/web/plugins/visuals/infos.py b/web/plugins/visuals/infos.py index f22219c..6b40a75 100644 --- a/web/plugins/visuals/infos.py +++ b/web/plugins/visuals/infos.py @@ -47,7 +47,16 @@ infos['hostgroup'] = { 'single_spec' : [ ('hostgroup', TextUnicode( title = _('Hostgroup Name'), - )), + )), + ], +} + +infos['hostgroup_summary'] = { + 'title' : _('Hostgroup Summary'), + 'single_spec' : [ + ('hostgroup', TextUnicode( + title = _('Hostgroup Name'), + )), ], }