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

invite: Replace invite_as_admin usage with invite_as.

Browse Source 
Since we have already added the `invite_as` field to models, we can now
replace usage of `invite_as_admin` properly with its equivalent `invite_as
== PreregistrationUser.INVITE_AS['REALM_ADMIN']`.

Hence, also removed now redundant `invite_as`.
This commit is contained in:
Shubham Dhama
2018-12-30 15:36:12 +05:30
committed by Tim Abbott
parent c9414a3572
commit 42c262b807
9 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/actions.py
View File

@@ -4627,7 +4627,7 @@ def check_invite_limit(realm: Realm, num_invitees: int) -> None:
def do_invite_users(user_profile: UserProfile,
invitee_emails: SizedTextIterable,
streams: Iterable[Stream],
invite_as_admin: Optional[bool]=False) -> None:
invite_as: Optional[int]=PreregistrationUser.INVITE_AS['MEMBER']) -> None:
check_invite_limit(user_profile.realm, len(invitee_emails))
@@ -4677,7 +4677,7 @@ def do_invite_users(user_profile: UserProfile,
for email in validated_emails:
# The logged in user is the referrer.
prereg_user = PreregistrationUser(email=email, referred_by=user_profile,
invited_as_admin=invite_as_admin,
invited_as=invite_as,
realm=user_profile.realm)
prereg_user.save()
stream_ids = [stream.id for stream in streams]
@@ -4709,7 +4709,7 @@ def do_get_user_invites(user_profile: UserProfile) -> List[Dict[str, Any]]:
ref=invitee.referred_by.email,
invited=datetime_to_timestamp(invitee.invited_at),
id=invitee.id,
invited_as_admin=invitee.invited_as_admin))
invited_as=invitee.invited_as))
return invites