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

bulk_add_members_to_user_group: Pass user group.

Browse Source 
Previously we passed user group id. If we pass user group, send event is
easier.
This commit is contained in:
Umair Khan
2017-11-14 12:40:53 +05:00
committed by Tim Abbott
parent 5ef3974e80
commit 66179ea295
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/actions.py
View File

@@ -4316,9 +4316,9 @@ def do_update_user_group_description(user_group, description):
user_group.description = description user_group.description = description
user_group.save(update_fields=['description']) user_group.save(update_fields=['description'])
def bulk_add_members_to_user_group(user_group_id, user_profiles): def bulk_add_members_to_user_group(user_group, user_profiles):
# type: (int, List[UserProfile]) -> None # type: (UserGroup, List[UserProfile]) -> None
memberships = [UserGroupMembership(user_group_id=user_group_id, memberships = [UserGroupMembership(user_group_id=user_group.id,
user_profile=user_profile) user_profile=user_profile)
for user_profile in user_profiles] for user_profile in user_profiles]
UserGroupMembership.objects.bulk_create(memberships) UserGroupMembership.objects.bulk_create(memberships)

2
zerver/views/user_groups.py
View File

@@ -85,7 +85,7 @@ def add_members_to_group_backend(request, user_profile, user_group_id, members):
if user_profile.id in existing_member_ids: if user_profile.id in existing_member_ids:
raise JsonableError(_("User %s is already a member of this group" % (user_profile.id,))) raise JsonableError(_("User %s is already a member of this group" % (user_profile.id,)))
bulk_add_members_to_user_group(user_group_id, user_profiles) bulk_add_members_to_user_group(user_group, user_profiles)
return json_success() return json_success()
def remove_members_from_group_backend(request, user_profile, user_group_id, members): def remove_members_from_group_backend(request, user_profile, user_group_id, members):