paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-26 09:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream: Do not pass user group object when changing group setting.

Browse Source 
Passing the user group object in case of named user group is fine for
`do_change_stream_group_based_setting`. But for anonymous groups, if the
code path calling that function is not creating a new anonymous user
group, it has to modify the user group by itself before calling that
function. In that case, if `old_setting_api_value` is not provided,
`old_user_group` is calculated false, since the group id has not changed
for the stream, but the group membership has changed.
old_setting_api_value will be the same as new_setting_api_value in such
a case.
It is better to accept the new setting value as either an int or
UserGroupMembersDict, so that `do_change_stream_group_based_setting` can
decide what to do with that argument.
This commit is contained in:
Shubham Padia
2025-03-03 13:15:41 +00:00
committed by Tim Abbott
parent 0c57126104
commit 8481dcedc4
13 changed files with 318 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
zerver/lib/user_groups.py
View File

@@ -455,6 +455,31 @@ def update_or_create_user_group_for_setting(
return user_group
def access_user_group_api_value_for_setting(
setting_user_group: int | UserGroupMembersDict,
user_profile: UserProfile,
*,
setting_name: str,
permission_configuration: GroupPermissionSetting,
) -> NamedUserGroup | UserGroupMembersDict:
if isinstance(setting_user_group, int):
named_user_group = get_user_group_by_id_in_realm(
setting_user_group, user_profile.realm, for_read=False, for_setting=True
)
check_setting_configuration_for_system_groups(
named_user_group, setting_name, permission_configuration
)
return named_user_group
if permission_configuration.require_system_group:
raise SystemGroupRequiredError(setting_name)
return UserGroupMembersDict(
direct_members=setting_user_group.direct_members,
direct_subgroups=setting_user_group.direct_subgroups,
)
def access_user_group_for_setting(
setting_user_group: int | UserGroupMembersDict,
user_profile: UserProfile,
@@ -467,22 +492,19 @@ def access_user_group_for_setting(
should have (setting_user_group), returns either a Named or
anonymous `UserGroup` with the requested membership.
"""
if isinstance(setting_user_group, int):
named_user_group = get_user_group_by_id_in_realm(
setting_user_group, user_profile.realm, for_read=False, for_setting=True
)
check_setting_configuration_for_system_groups(
named_user_group, setting_name, permission_configuration
)
return named_user_group.usergroup_ptr
if permission_configuration.require_system_group:
raise SystemGroupRequiredError(setting_name)
user_group_api_value_for_setting = access_user_group_api_value_for_setting(
setting_user_group,
user_profile,
setting_name=setting_name,
permission_configuration=permission_configuration,
)
if isinstance(user_group_api_value_for_setting, NamedUserGroup):
return user_group_api_value_for_setting.usergroup_ptr
user_group = update_or_create_user_group_for_setting(
user_profile,
setting_user_group.direct_members,
setting_user_group.direct_subgroups,
user_group_api_value_for_setting.direct_members,
user_group_api_value_for_setting.direct_subgroups,
current_setting_value,
)