[checkmk-commits] Fixed merge issue

Module: check_mk Branch: master Commit: 102bc29273f2c6cd6d20757f0dc450b23de6170c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=102bc29273f2c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 30 10:45:49 2018 +0200 Fixed merge issue Change-Id: I68f2c0bec119c13dc93649fd68edac07c0348168 --- web/htdocs/wato.py | 4 ++-- web/htdocs/watolib.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 639c28d..4d82d01 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9105,7 +9105,7 @@ def mode_user_notifications(phase, profilemode): return if notification_rule_start_async_repl: - user_profile_async_replication_dialog(sites=get_notification_sync_sites()) + user_profile_async_replication_dialog(sites=watolib.get_notification_sync_sites()) notification_rule_start_async_repl = False html.h3(_('Notification Rules')) @@ -9224,7 +9224,7 @@ def mode_notification_rule(phase, profilemode): return "notifications" if notification_rule_start_async_repl: - user_profile_async_replication_dialog(sites=get_notification_sync_sites()) + user_profile_async_replication_dialog(sites=watolib.get_notification_sync_sites()) notification_rule_start_async_repl = False return diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 918aa16..25adefe 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4322,7 +4322,7 @@ def get_event_console_sync_sites(): def get_notification_sync_sites(): - return sorted([ site_id for site_id, site in wato_slave_sites() + return sorted([ site_id for site_id, site in config.wato_slave_sites() if not config.site_is_local(site_id) ])