paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 12:33:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

forms.HomepageForm: Rename subdomain to string_id.

Browse Source 
No change to behavior.
This commit is contained in:
Rishi Gupta
2016-11-07 16:07:44 -08:00
committed by Tim Abbott
parent 38f1ab325c
commit b114690bd5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/forms.py
View File

@@ -108,9 +108,9 @@ class HomepageForm(forms.Form):
def __init__(self, *args, **kwargs):
# type: (*Any, **Any) -> None
self.subdomain = kwargs.get("subdomain")
if "subdomain" in kwargs:
del kwargs["subdomain"]
self.string_id = kwargs.get("string_id")
if "string_id" in kwargs:
del kwargs["string_id"]
super(HomepageForm, self).__init__(*args, **kwargs)
def clean_email(self):
@@ -124,8 +124,8 @@ class HomepageForm(forms.Form):
# Otherwise, the user is trying to join a specific realm.
realm = None
if self.subdomain:
realm = get_realm_by_string_id(self.subdomain)
if self.string_id:
realm = get_realm_by_string_id(self.string_id)
elif not settings.REALMS_HAVE_SUBDOMAINS:
realm = get_realm(resolve_email_to_domain(email))