paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-26 01:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

request: Move realm from the request to ZulipRequestNotes.

Browse Source
This commit is contained in:
PIG208
2021-07-09 23:16:26 +08:00
committed by Tim Abbott
parent 5167a93229
commit 8eb2c3ffdb
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/context_processors.py
View File

@@ -17,6 +17,7 @@ from version import (
from zerver.lib.exceptions import InvalidSubdomainError
from zerver.lib.realm_description import get_realm_rendered_description, get_realm_text_description
from zerver.lib.realm_icon import get_realm_icon_url
from zerver.lib.request import get_request_notes
from zerver.lib.send_email import FromAddress
from zerver.lib.subdomains import get_subdomain
from zerver.models import Realm, UserProfile, get_realm
@@ -50,19 +51,22 @@ def common_context(user: UserProfile) -> Dict[str, Any]:
def get_realm_from_request(request: HttpRequest) -> Optional[Realm]:
request_notes = get_request_notes(request)
if hasattr(request, "user") and hasattr(request.user, "realm"):
return request.user.realm
if not hasattr(request, "realm"):
# We cache the realm object from this function on the request,
if not request_notes.has_fetched_realm:
# We cache the realm object from this function on the request data,
# so that functions that call get_realm_from_request don't
# need to do duplicate queries on the same realm while
# processing a single request.
subdomain = get_subdomain(request)
request_notes = get_request_notes(request)
try:
request.realm = get_realm(subdomain)
request_notes.realm = get_realm(subdomain)
except Realm.DoesNotExist:
request.realm = None
return request.realm
request_notes.realm = None
request_notes.has_fetched_realm = True
return request_notes.realm
def get_valid_realm_from_request(request: HttpRequest) -> Realm: