paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-30 11:33:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

user_groups: Do not include deactivated users in anonymous group settings.

Browse Source 
This commit updates code to not include deactivated users in the
anonymous group settings data sent to clients, where the setting
value is sent as a dict containing members and subgroups of the
anonymous group.
This commit is contained in:
Sahil Batra
2024-09-23 19:45:17 +05:30
committed by Tim Abbott
parent 9292ad8186
commit 0b58820294
7 changed files with 305 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/user_groups.py
View File

@@ -516,7 +516,9 @@ def get_group_setting_value_for_api(
return setting_value_group.id
return AnonymousSettingGroupDict(
direct_members=[member.id for member in setting_value_group.direct_members.all()],
direct_members=[
member.id for member in setting_value_group.direct_members.filter(is_active=True)
],
direct_subgroups=[subgroup.id for subgroup in setting_value_group.direct_subgroups.all()],
)
@@ -565,7 +567,7 @@ def user_groups_in_realm_serialized(
membership = (
UserGroupMembership.objects.filter(user_group__realm=realm)
.exclude(user_profile__is_active=False, user_group__named_user_group__isnull=False)
.exclude(user_profile__is_active=False)
.values_list("user_group_id", "user_profile_id")
)