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

invite: Rename NORMAL_USER to MEMBER of Preregistration.INVITE_AS.

Browse Source 
Renamed to keep the user-facing and the codebase terminologies coherent.
This commit is contained in:
Shubham Dhama
2019-01-03 21:20:36 +05:30
committed by Tim Abbott
parent 2adb0734d1
commit c9414a3572
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/migrations/0198_preregistrationuser_invited_as.py
View File

@@ -10,17 +10,17 @@ def set_initial_value_for_invited_as(apps: StateApps, schema_editor: DatabaseSch
PreregistrationUser = apps.get_model("zerver", "PreregistrationUser") PreregistrationUser = apps.get_model("zerver", "PreregistrationUser")
for user in PreregistrationUser.objects.all(): for user in PreregistrationUser.objects.all():
if user.invited_as_admin: if user.invited_as_admin:
user.invited_as = 1 # PreregistrationUser.REALM_ADMIN user.invited_as = 1 # PreregistrationUser.INVITE_AS['REALM_ADMIN']
else: else:
user.invited_as = 2 # PreregistrationUser.NORMAL_USER user.invited_as = 2 # PreregistrationUser.INVITE_AS['MEMBER']
user.save(update_fields=["invited_as"]) user.save(update_fields=["invited_as"])
def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None: def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
PreregistrationUser = apps.get_model("zerver", "PreregistrationUser") PreregistrationUser = apps.get_model("zerver", "PreregistrationUser")
for user in PreregistrationUser.objects.all(): for user in PreregistrationUser.objects.all():
if user.invited_as == 1: # PreregistrationUser.REALM_ADMIN if user.invited_as == 1: # PreregistrationUser.INVITE_AS['REALM_ADMIN']
user.invited_as_admin = True user.invited_as_admin = True
else: # PreregistrationUser.NORMAL_USER else: # PreregistrationUser.INVITE_AS['MEMBER']
user.invited_as_admin = False user.invited_as_admin = False
user.save(update_fields=["invited_as_admin"]) user.save(update_fields=["invited_as_admin"])

4
zerver/models.py
View File

@@ -1048,11 +1048,11 @@ class PreregistrationUser(models.Model):
realm = models.ForeignKey(Realm, null=True, on_delete=CASCADE) # type: Optional[Realm] realm = models.ForeignKey(Realm, null=True, on_delete=CASCADE) # type: Optional[Realm]
INVITE_AS = dict( INVITE_AS = dict(
NORMAL_USER = 1, MEMBER = 1,
REALM_ADMIN = 2, REALM_ADMIN = 2,
GUEST_USER = 3, GUEST_USER = 3,
) )
invited_as = models.PositiveSmallIntegerField(default=INVITE_AS['NORMAL_USER']) # type: int invited_as = models.PositiveSmallIntegerField(default=INVITE_AS['MEMBER']) # type: int
invited_as_admin = models.BooleanField(default=False) # type: bool invited_as_admin = models.BooleanField(default=False) # type: bool