Module: check_mk
Branch: master
Commit: 5046a4122d74ddf1cae21e545026c9efc82745b3
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5046a4122d74dd…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Sep 1 14:11:31 2017 +0200
Fixed recently broken validation of contact group usage
Change-Id: I680a9a3953429ef40f2199715ec3dea37c9f212b
---
web/htdocs/watolib.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py
index b57447f..29c4c8f 100644
--- a/web/htdocs/watolib.py
+++ b/web/htdocs/watolib.py
@@ -8238,7 +8238,8 @@ def delete_group(name, group_type):
# Check if still used
usages = find_usages_of_group(name, group_type)
if usages:
- raise MKUserError(None, _("Unable to delete group. It is still in
use"))
+ raise MKUserError(None, _("Unable to delete group. It is still in use by:
%s") %
+ ", ".join([ e[0] for e in
usages ]))
# Delete group
group = groups.pop(name)
@@ -8344,7 +8345,7 @@ def find_usages_of_contact_group(name):
# Used in default_user_profile?
domain, valuespec, need_restart, allow_reset, in_global_settings =
configvars()['default_user_profile']
configured = global_config.get('default_user_profile', {})
- default_value = valuespec.default_value()
+ default_value = domain().default_globals()["default_user_profile"]
if (configured and name in configured['contactgroups']) \
or name in default_value['contactgroups']:
used_in.append(('%s' % (_('Default User Profile')),
@@ -8354,7 +8355,7 @@ def find_usages_of_contact_group(name):
if 'mkeventd_notify_contactgroup' in configvars():
domain, valuespec, need_restart, allow_reset, in_global_settings =
configvars()['mkeventd_notify_contactgroup']
configured = global_config.get('mkeventd_notify_contactgroup')
- default_value = valuespec.default_value()
+ default_value =
domain().default_globals()["mkeventd_notify_contactgroup"]
if (configured and name == configured) \
or name == default_value:
used_in.append(('%s' % (valuespec.title()),