[checkmk-commits] Check_MK Git: check_mk: WATO: Also write out contact definitions for users without contactgroups

Module: check_mk Branch: master Commit: c5d6e15d0ca8c3d0cef3bf5fbbd374629de345ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5d6e15d0ca8c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 08:56:37 2012 +0200 WATO: Also write out contact definitions for users without contactgroups to have the mail addresses and other notification options persisted --- ChangeLog | 2 ++ web/htdocs/wato.py | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index acd35db..40a95d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.2.0b2: WATO: * Added new permission "move hosts" to allow/deny moving of hosts in WATO + * Also write out contact definitions for users without contactgroups to + have the mail addresses and other notification options persisted * FIX: deletion of automation accounts now works Multisite diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ff8da13..090e090 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7243,14 +7243,12 @@ def save_users(profiles): # Keys to put into multisite configuration multisite_keys = [ "roles", "notifications_enabled", "locked", "automation_secret", "alias", "language", ] + custom_values - # Remove multisite keys in contacts. And use only such entries - # that have any contact groups assigned to. + # Remove multisite keys in contacts. contacts = dict( e for e in [ (id, split_dict(user, non_contact_keys, False)) for (id, user) - in profiles.items() ] - if e[1].get("contactgroups")) + in profiles.items() ]) # Only allow explicitely defined attributes to be written to multisite config users = {}