[checkmk-commits] 5236 FIX Edit host/service/contactgroups: Fixed exception in CME, improved audit logging

Module: check_mk Branch: master Commit: 676c0dad40609ff87ff3e70a50b04bf7586981a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=676c0dad40609f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 19 12:35:45 2017 +0200 5236 FIX Edit host/service/contactgroups: Fixed exception in CME, improved audit logging Change-Id: Id5f0550a9afe8f5cc2ed47be24730a64429386af --- .werks/5236 | 10 ++++++++++ web/htdocs/watolib.py | 23 ++++++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.werks/5236 b/.werks/5236 new file mode 100644 index 0000000..8839f90 --- /dev/null +++ b/.werks/5236 @@ -0,0 +1,10 @@ +Title: Edit host/service/contactgroups: Fixed exception in CME, improved audit logging +Level: 2 +Component: wato +Class: fix +Compatible: compat +Edition: cme +State: unknown +Version: 1.5.0i1 +Date: 1508409286 + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 4ca72d9..3f95d9b 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -8396,8 +8396,25 @@ def edit_group(name, group_type, extra_info): if name not in groups: raise MKUserError("name", _("Unknown group: %s") % name) + + import copy + old_group = copy.deepcopy(groups[name]) + old_customer = managed.get_customer_id(old_group) + new_customer = managed.get_customer_id(extra_info) + _set_group(all_groups, group_type, name, extra_info) - add_group_change(extra_info, "edit-%sgroups" % group_type, _("Updated properties of %s group %s") % (group_type, name)) + if cmk.is_managed_edition() and old_customer != new_customer: + add_group_change(old_group, "edit-%sgroups" % group_type, + _("Removed %sgroup %s from customer %s") % (group_type, + name, + managed.get_customer_name_by_id(old_customer))) + add_group_change(extra_info, "edit-%sgroups" % group_type, + _("Moved %sgroup %s to customer %s. Additional properties may have changed.") % + (group_type, + name, + managed.get_customer_name_by_id(new_customer))) + else: + add_group_change(extra_info, "edit-%sgroups" % group_type, _("Updated properties of %s group %s") % (group_type, name)) def delete_group(name, group_type): @@ -8425,8 +8442,8 @@ def delete_group(name, group_type): # by the CME code for better encapsulation. def add_group_change(group, action_name, text): group_sites = None - if cmk.is_managed_edition() and not managed.is_global(group["customer"]): - group_sites = managed.get_sites_of_customer(group["customer"]) + if cmk.is_managed_edition() and not managed.is_global(managed.get_customer_id(group)): + group_sites = managed.get_sites_of_customer(managed.get_customer_id(group)) add_change(action_name, text, sites=group_sites)