[checkmk-commits] 4022 Removed no longer supported (hidden) WATO feature: wato_hidden_users

Module: check_mk Branch: master Commit: df48ae299fb543557ed9a6317a3fd38fe5c33d6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df48ae299fb543… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 7 14:51:54 2017 +0100 4022 Removed no longer supported (hidden) WATO feature: wato_hidden_users Change-Id: I8aa25c1ae3c2ab500a94554bb0f9a141e8852616 --- .werks/4022 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 ++++---- web/htdocs/watolib.py | 7 ------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.werks/4022 b/.werks/4022 new file mode 100644 index 0000000..9d1c738 --- /dev/null +++ b/.werks/4022 @@ -0,0 +1,9 @@ +Title: Removed no longer supported (hidden) WATO feature: wato_hidden_users +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486475476 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e0f6eb8..bd8c0ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 4018 WATO WebAPI: new functions to manage host, service and contactgroups... * 4319 Reworked the service discovery dialog... * 4320 Distributed: Master site has now also site specific global settings... + * 4022 Removed no longer supported (hidden) WATO feature: wato_hidden_users * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config" * 4218 FIX: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 557dab5..ffa446c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6943,7 +6943,7 @@ def mode_groups(phase, what): # Show member of contact groups if what == "contact": - users = filter_hidden_users(userdb.load_users()) + users = userdb.load_users() members = {} for userid, user in users.items(): cgs = user.get("contactgroups", []) @@ -10142,7 +10142,7 @@ def mode_users(phase): return roles = userdb.load_roles() - users = filter_hidden_users(userdb.load_users(lock = phase == 'action' and html.var('_delete'))) + users = userdb.load_users(lock = phase == 'action' and html.var('_delete')) timeperiods = load_timeperiods() contact_groups = userdb.load_group_information().get("contact", {}) @@ -10917,7 +10917,7 @@ def mode_edit_user(phase): def generate_wato_users_elements_function(none_value, only_contacts = False): def get_wato_users(nv): - users = filter_hidden_users(userdb.load_users()) + users = userdb.load_users() elements = [ (name, "%s - %s" % (name, us.get("alias", name))) for (name, us) in users.items() @@ -10979,7 +10979,7 @@ def mode_roles(phase): return roles = userdb.load_roles() - users = filter_hidden_users(userdb.load_users()) + users = userdb.load_users() if phase == "action": if html.var("_delete"): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fa734a5..9b21562 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7136,13 +7136,6 @@ def save_group_information(all_groups): os.rename(filename, filename[:-4]) - -def filter_hidden_users(users): - if config.wato_hidden_users: - return dict([ (id, user) for id, user in users.items() if id not in config.wato_hidden_users ]) - else: - return users - def find_usages_of_group(name, group_type): usages = [] if group_type== 'contact':