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

subdomains: Dedupe out the last copy of Realm.host_for_subdomain.

Browse Source 
This makes the affected code somewhat easier to read, and paves the
way for changing this logic to add support for alias domains.
This commit is contained in:
Greg Price
2017-10-30 14:13:13 -07:00
parent eb55a3a1ba
commit 22e5110789
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/views/integrations.py
View File

@@ -26,16 +26,13 @@ def add_api_uri_context(context, request):
else: else:
display_subdomain = 'yourZulipDomain' display_subdomain = 'yourZulipDomain'
html_settings_links = False html_settings_links = False
if display_subdomain != Realm.SUBDOMAIN_FOR_ROOT_DOMAIN:
api_url_scheme_relative = '%s.%s/api' % (display_subdomain,
settings.EXTERNAL_HOST)
else:
api_url_scheme_relative = settings.EXTERNAL_HOST + "/api"
api_url = '%s%s' % (settings.EXTERNAL_URI_SCHEME, api_url_scheme_relative) display_host = Realm.host_for_subdomain(display_subdomain)
api_url_scheme_relative = display_host + "/api"
api_url = settings.EXTERNAL_URI_SCHEME + api_url_scheme_relative
context['api_url_scheme_relative'] = api_url_scheme_relative
context['api_url'] = api_url context['api_url'] = api_url
context['api_url_scheme_relative'] = api_url_scheme_relative
context["html_settings_links"] = html_settings_links context["html_settings_links"] = html_settings_links
class ApiURLView(TemplateView): class ApiURLView(TemplateView):