Module: check_mk
Branch: master
Commit: f6c80c92330421d7d3f4b2b35d42817fb30a5884
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6c80c92330421…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Feb 13 19:52:29 2019 +0100
Cleanup group config loading
Use effective GUI config instead of using the WATO exclusive group
loading logic to get the group configuration.
Change-Id: If4e69ea9d9b83e13caf299dc54a75eb558343030
---
cmk/gui/inventory.py | 5 +++--
cmk/gui/plugins/config/base.py | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py
index 1efa612..6604f86 100644
--- a/cmk/gui/inventory.py
+++ b/cmk/gui/inventory.py
@@ -311,8 +311,9 @@ def _get_permitted_inventory_paths():
cache_varname = "permitted_inventory_paths"
if cache_varname in current_app.g:
return current_app.g[cache_varname]
- contact_groups = userdb.load_group_information().get("contact", {})
+
user_groups = userdb.contactgroups_of_user(config.user.id)
+
if not user_groups:
current_app.g[cache_varname] = None
return None
@@ -320,7 +321,7 @@ def _get_permitted_inventory_paths():
forbid_whole_tree = False
permitted_paths = []
for user_group in user_groups:
- inventory_paths = contact_groups.get(user_group,
{}).get('inventory_paths')
+ inventory_paths = config.multisite_contactgroups.get(user_group,
{}).get('inventory_paths')
if inventory_paths is None:
# Old configuration: no paths configured means 'allow_all'
current_app.g[cache_varname] = None
diff --git a/cmk/gui/plugins/config/base.py b/cmk/gui/plugins/config/base.py
index c553f64..741ac7a 100644
--- a/cmk/gui/plugins/config/base.py
+++ b/cmk/gui/plugins/config/base.py
@@ -56,8 +56,10 @@ log_levels = {
"cmk.web.automations": 30,
}
-# New style, used by WATO
multisite_users = {}
+multisite_hostgroups = {}
+multisite_servicegroups = {}
+multisite_contactgroups = {}
# ____ _ _ _
# / ___|(_) __| | ___| |__ __ _ _ __