From 146f2ca48286a171f4cf6d9c544587494da8d502 Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Fri, 23 Dec 2016 21:01:39 -0800 Subject: [PATCH] Refactor get_realm_from_request out of views.create_homepage_form. --- zerver/views/__init__.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index d110f17b4b..9e727ca8d7 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -298,11 +298,7 @@ def accounts_accept_terms(request): def create_homepage_form(request, user_info=None): # type: (HttpRequest, Optional[Dict[str, Any]]) -> HomepageForm - if settings.REALMS_HAVE_SUBDOMAINS: - realm = get_realm_by_string_id(get_subdomain(request)) - else: - realm = get_realm(request.session.get("domain")) - + realm = get_realm_from_request(request) if user_info: return HomepageForm(user_info, realm=realm) # An empty fields dict is not treated the same way as not @@ -396,6 +392,12 @@ def confirmation_key(request): # type: (HttpRequest) -> HttpResponse return json_success(request.session.get('confirmation_key')) +def get_realm_from_request(request): + # type: (HttpRequest) -> Realm + if settings.REALMS_HAVE_SUBDOMAINS: + return get_realm_by_string_id(get_subdomain(request)) + return get_realm(request.session.get("domain")) + def accounts_home(request): # type: (HttpRequest) -> HttpResponse if request.method == 'POST':