[checkmk-commits] Simplify GroupChoice valuespec

Module: check_mk Branch: master Commit: 88255cf7e9fd44c6b63734fbd91ae71795e7f3a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88255cf7e9fd44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 20:36:39 2019 +0100 Simplify GroupChoice valuespec The with_foreign_groups handling is not needed anymore by any call site. Change-Id: If401a15cc1b341d0dd39602dca1271ade9bc3786 --- cmk/gui/userdb.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 1099fe9..df0cc9d 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -1141,17 +1141,14 @@ def _load_gui_groups(): class GroupChoice(DualListChoice): - def __init__(self, what, with_foreign_groups=True, **kwargs): - DualListChoice.__init__(self, **kwargs) + def __init__(self, what, **kwargs): + super(GroupChoice, self).__init__(choices=self._load_groups, **kwargs) self.what = what - self._choices = lambda: self.load_groups(with_foreign_groups) - def load_groups(self, with_foreign_groups): + def _load_groups(self): all_groups = load_group_information() this_group = all_groups.get(self.what, {}) - return sorted([(k, t['alias'] and t['alias'] or k) - for (k, t) in this_group.items() - if with_foreign_groups or k in config.user.contact_groups()], + return sorted([(k, t['alias'] and t['alias'] or k) for (k, t) in this_group.items()], key=lambda x: x[1].lower())