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

home: Refactor emojiset and billing logic for None UserProfile.

Browse Source
This commit is contained in:
Tim Abbott
2019-09-13 17:24:21 -07:00
parent 7c0a98754a
commit 5f8af84ad1
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/views/home.py
View File

@@ -277,7 +277,7 @@ def home_real(request: HttpRequest) -> HttpResponse:
show_billing = False show_billing = False
show_plans = False show_plans = False
if settings.CORPORATE_ENABLED: if settings.CORPORATE_ENABLED and user_profile is not None:
from corporate.models import Customer, CustomerPlan from corporate.models import Customer, CustomerPlan
if user_profile.is_billing_admin or user_profile.is_realm_admin: if user_profile.is_billing_admin or user_profile.is_realm_admin:
customer = Customer.objects.filter(realm=user_profile.realm).first() customer = Customer.objects.filter(realm=user_profile.realm).first()
@@ -293,13 +293,17 @@ def home_real(request: HttpRequest) -> HttpResponse:
page_params['translation_data'] = get_language_translation_data(request_language) page_params['translation_data'] = get_language_translation_data(request_language)
csp_nonce = generate_random_token(48) csp_nonce = generate_random_token(48)
emojiset = user_profile.emojiset if user_profile is not None:
if emojiset == UserProfile.TEXT_EMOJISET: if user_profile.emojiset == UserProfile.TEXT_EMOJISET:
# If current emojiset is `TEXT_EMOJISET`, then fallback to # If current emojiset is `TEXT_EMOJISET`, then fallback to
# GOOGLE_EMOJISET for picking which spritesheet's CSS to # GOOGLE_EMOJISET for picking which spritesheet's CSS to
# include (and thus how to display emojis in the emoji picker # include (and thus how to display emojis in the emoji picker
# and composebox typeahead). # and composebox typeahead).
emojiset = UserProfile.GOOGLE_BLOB_EMOJISET emojiset = UserProfile.GOOGLE_BLOB_EMOJISET
else:
emojiset = user_profile.emojiset
else: # nocoverage
emojiset = UserProfile.GOOGLE_BLOB_EMOJISET
navbar_logo_url = compute_navbar_logo_url(page_params) navbar_logo_url = compute_navbar_logo_url(page_params)