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

user_groups: Pass config object to access_user_group_for_setting.

Browse Source 
We now pass the complete configuration object for a setting to
access_user_group_for_setting instead of passing the configuration
object's fields as different variables.
This commit is contained in:
Sahil Batra
2023-09-18 20:25:58 +05:30
committed by Tim Abbott
parent 08d41f9eb3
commit 2c43c2a4db
4 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/views/streams.py
View File

@@ -394,11 +394,7 @@ def update_stream_backend(
user_group_id,
user_profile,
setting_name=setting_name,
require_system_group=permission_configuration.require_system_group,
allow_internet_group=permission_configuration.allow_internet_group,
allow_owners_group=permission_configuration.allow_owners_group,
allow_nobody_group=permission_configuration.allow_nobody_group,
allow_everyone_group=permission_configuration.allow_everyone_group,
permission_configuration=permission_configuration,
)
do_change_stream_group_based_setting(
stream, setting_name, user_group, acting_user=user_profile
@@ -578,12 +574,14 @@ def add_subscriptions_backend(
color_map = {}
if can_remove_subscribers_group_id is not None:
permission_configuration = Stream.stream_permission_group_settings[
"can_remove_subscribers_group"
]
can_remove_subscribers_group = access_user_group_for_setting(
can_remove_subscribers_group_id,
user_profile,
setting_name="can_remove_subscribers_group",
require_system_group=True,
allow_nobody_group=False,
permission_configuration=permission_configuration,
)
else:
can_remove_subscribers_group_default_name = Stream.stream_permission_group_settings[