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

user_groups: Track acting_user for update_users_in_full_members_system_group.

Browse Source 
This is a prep-commit for populating RealmAuditLogs for changes made to
UserGroup.

Signed-off-by: Zixuan James Li <p359101898@gmail.com>
This commit is contained in:
Zixuan James Li
2022-11-20 18:30:07 -08:00
committed by Tim Abbott
parent b3aba796f1
commit f55717d34d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/actions/realm_settings.py
View File

@@ -115,7 +115,7 @@ def do_set_realm_property(
send_user_email_update_event(user_profile) send_user_email_update_event(user_profile)
if name == "waiting_period_threshold": if name == "waiting_period_threshold":
update_users_in_full_members_system_group(realm) update_users_in_full_members_system_group(realm, acting_user=acting_user)
def do_set_realm_authentication_methods( def do_set_realm_authentication_methods(

4
zerver/actions/user_groups.py
View File

@@ -27,7 +27,7 @@ class MemberGroupUserDict(TypedDict):
@transaction.atomic(savepoint=False) @transaction.atomic(savepoint=False)
def update_users_in_full_members_system_group( def update_users_in_full_members_system_group(
realm: Realm, affected_user_ids: Sequence[int] = [] realm: Realm, affected_user_ids: Sequence[int] = [], *, acting_user: Optional[UserProfile]
) -> None: ) -> None:
full_members_system_group = UserGroup.objects.get( full_members_system_group = UserGroup.objects.get(
realm=realm, name=UserGroup.FULL_MEMBERS_GROUP_NAME, is_system_group=True realm=realm, name=UserGroup.FULL_MEMBERS_GROUP_NAME, is_system_group=True
@@ -91,7 +91,7 @@ def update_users_in_full_members_system_group(
def promote_new_full_members() -> None: def promote_new_full_members() -> None:
for realm in Realm.objects.filter(deactivated=False).exclude(waiting_period_threshold=0): for realm in Realm.objects.filter(deactivated=False).exclude(waiting_period_threshold=0):
update_users_in_full_members_system_group(realm) update_users_in_full_members_system_group(realm, acting_user=None)
def do_send_create_user_group_event( def do_send_create_user_group_event(

4
zerver/actions/users.py
View File

@@ -231,7 +231,9 @@ def do_change_user_role(
do_send_user_group_members_update_event("add_members", system_group, [user_profile.id]) do_send_user_group_members_update_event("add_members", system_group, [user_profile.id])
if UserProfile.ROLE_MEMBER in [old_value, value]: if UserProfile.ROLE_MEMBER in [old_value, value]:
update_users_in_full_members_system_group(user_profile.realm, [user_profile.id]) update_users_in_full_members_system_group(
user_profile.realm, [user_profile.id], acting_user=acting_user
)
def do_make_user_billing_admin(user_profile: UserProfile) -> None: def do_make_user_billing_admin(user_profile: UserProfile) -> None: