mirror of
https://github.com/zulip/zulip.git
synced 2025-11-02 04:53:36 +00:00
user_groups: Track acting user for check_delete_user_group.
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:
committed by
Tim Abbott
parent
e78dfc2868
commit
5b37306c27
@@ -229,7 +229,9 @@ def do_send_delete_user_group_event(realm: Realm, user_group_id: int, realm_id:
|
||||
send_event(realm, event, active_user_ids(realm_id))
|
||||
|
||||
|
||||
def check_delete_user_group(user_group_id: int, user_profile: UserProfile) -> None:
|
||||
def check_delete_user_group(
|
||||
user_group_id: int, user_profile: UserProfile, *, acting_user: Optional[UserProfile]
|
||||
) -> None:
|
||||
user_group = access_user_group_by_id(user_group_id, user_profile)
|
||||
user_group.delete()
|
||||
do_send_delete_user_group_event(user_profile.realm, user_group_id, user_profile.realm.id)
|
||||
|
||||
@@ -1330,7 +1330,9 @@ class NormalActionsTest(BaseAction):
|
||||
check_user_group_remove_subgroups("events[0]", events[0])
|
||||
|
||||
# Test remove event
|
||||
events = self.verify_action(lambda: check_delete_user_group(backend.id, othello))
|
||||
events = self.verify_action(
|
||||
lambda: check_delete_user_group(backend.id, othello, acting_user=None)
|
||||
)
|
||||
check_user_group_remove("events[0]", events[0])
|
||||
|
||||
def test_default_stream_groups_events(self) -> None:
|
||||
|
||||
@@ -87,7 +87,7 @@ def delete_user_group(
|
||||
user_group_id: int = REQ(json_validator=check_int, path_only=True),
|
||||
) -> HttpResponse:
|
||||
|
||||
check_delete_user_group(user_group_id, user_profile)
|
||||
check_delete_user_group(user_group_id, user_profile, acting_user=user_profile)
|
||||
return json_success(request)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user