[checkmk-commits] 6687 FIX Fixed broken prefered button computation

Module: check_mk Branch: master Commit: 8adf95db58c43f08762e1a1716a595eb14671736 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8adf95db58c43f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 11:44:48 2018 +0100 6687 FIX Fixed broken prefered button computation The computation of the prefered buttons within views did not work. Change-Id: Ia20705db845968dcf9f34b3f309e831e6dd4dbc1 --- .werks/6687 | 10 ++++++++++ cmk/gui/inventory.py | 8 ++++---- cmk/gui/views.py | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/6687 b/.werks/6687 new file mode 100644 index 0000000..dc9a4d2 --- /dev/null +++ b/.werks/6687 @@ -0,0 +1,10 @@ +Title: Fixed broken prefered button computation +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542624245 +Class: fix + +The computation of the prefered buttons within views did not work. diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index f1b1f35..9802c94 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -260,13 +260,13 @@ def _filter_tree(struct_tree): def _get_permitted_inventory_paths(): + """ + Returns either a list of permitted paths or + None in case the user is allowed to see the whole tree. + """ cache_varname = "permitted_inventory_paths" if html.is_cached(cache_varname): return html.get_cached(cache_varname) - """ -Returns either a list of permitted paths or -None in case the user is allowed to see the whole tree. -""" contact_groups = userdb.load_group_information().get("contact", {}) user_groups = userdb.contactgroups_of_user(config.user.id) if not user_groups: diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 1cbad9d..84885d2 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1588,7 +1588,7 @@ def update_context_links(enable_command_toggle, enable_checkbox_toggle): @cmk.gui.pages.register("count_context_button") def ajax_count_button(): - id_ = html.var("id_") + id_ = html.var("id") counts = config.user.load_file("buttoncounts", {}) for i in counts: counts[i] *= 0.95