Module: check_mk
Branch: master
Commit: 647f51210efeaaa60526a14be077b9767f73c92c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=647f51210efeaa…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 12 09:10:23 2018 +0200
Fixed cyclic dependency between watolib and userdb
Change-Id: If3538b2f969b9449f32ffa19287db121b11bc11c
---
cmk/gui/userdb.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py
index 200918a..972385a 100644
--- a/cmk/gui/userdb.py
+++ b/cmk/gui/userdb.py
@@ -1300,8 +1300,7 @@ def execute_userdb_job():
def user_sync_default_config(site_name):
global_user_sync = transform_userdb_automatic_sync(config.userdb_automatic_sync)
if global_user_sync == "master":
- import cmk.gui.watolib as watolib
- if config.site_is_local(site_name) and not watolib.is_wato_slave_site():
+ if config.site_is_local(site_name) and not config.is_wato_slave_site():
user_sync_default = "all"
else:
user_sync_default = None
@@ -1324,8 +1323,7 @@ def userdb_sync_job_enabled():
if cfg == None:
return False # not enabled at all
- import cmk.gui.watolib as watolib
- if cfg == "master" and watolib.is_wato_slave_site():
+ if cfg == "master" and config.is_wato_slave_site():
return False
return True