integrations/email: Render settings.EMAIL_GATEWAY_EXAMPLE correctly.

This commit is contained in:
Eeshan Garg
2018-01-20 15:09:06 -03:30
committed by showell
parent 41685105db
commit 00d3f19c0a
2 changed files with 3 additions and 2 deletions

View File

@@ -113,7 +113,6 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]:
'realm_icon': realm_icon,
'realm_description': realm_description,
'root_domain_uri': settings.ROOT_DOMAIN_URI,
'email_gateway_example': settings.EMAIL_GATEWAY_EXAMPLE,
'apps_page_url': apps_page_url,
'open_realm_creation': settings.OPEN_REALM_CREATION,
'password_auth_enabled': password_auth_enabled(realm),

View File

@@ -11,7 +11,7 @@ import ujson
from zerver.lib import bugdown
from zerver.lib.integrations import CATEGORIES, INTEGRATIONS, HubotIntegration, \
WebhookIntegration
WebhookIntegration, EmailIntegration
from zerver.lib.request import has_request_variables, REQ
from zerver.lib.subdomains import get_subdomain
from zerver.models import Realm
@@ -148,6 +148,8 @@ def integration_doc(request: HttpRequest, integration_name: str=REQ(default=None
context['integration_url'] = integration.url[3:]
if isinstance(integration, HubotIntegration):
context['hubot_docs_url'] = integration.hubot_docs_url
if isinstance(integration, EmailIntegration):
context['email_gateway_example'] = settings.EMAIL_GATEWAY_EXAMPLE
doc_html_str = render_markdown_path(integration.doc, context)