From feaf6843de05f144602a1d9d64367a1bc700d92c Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 4 Dec 2013 16:35:38 -0500 Subject: [PATCH] Only document email integration if it is enabled. (imported from commit d1f13ff30c56f7a2156e8c00621b6b955302ccf0) --- templates/zerver/integrations.html | 5 ++++- zerver/context_processors.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/zerver/integrations.html b/templates/zerver/integrations.html index 9e35ee07da..3b402efef5 100644 --- a/templates/zerver/integrations.html +++ b/templates/zerver/integrations.html @@ -59,12 +59,14 @@ Desk.com +{% if email_integration_enabled %}
Email
+{% endif %}
@@ -491,7 +493,7 @@
- +{% if email_integration_enabled %}
@@ -522,6 +524,7 @@

Please note that it may take up to one minute for the message to show up in Zulip.

+{% endif %}
diff --git a/zerver/context_processors.py b/zerver/context_processors.py index 21994e2f49..14dc3e1118 100644 --- a/zerver/context_processors.py +++ b/zerver/context_processors.py @@ -19,6 +19,7 @@ def add_settings(request): 'external_api_uri': settings.EXTERNAL_API_URI, 'external_uri_scheme': settings.EXTERNAL_URI_SCHEME, 'api_site_required': settings.EXTERNAL_API_PATH != "api.zulip.com", + 'email_integration_enabled': settings.EMAIL_GATEWAY_BOT != "", } def add_metrics(request):