From ef9ee85c2532dabf6b13d6576404b84b4fa0e3e4 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Thu, 26 Jul 2018 09:30:31 +0100
Subject: [PATCH] Move the settings into a better location
---
opentech/apply/activity/messaging.py | 6 +++++-
opentech/settings/base.py | 5 +++++
opentech/settings/production.py | 2 --
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/opentech/apply/activity/messaging.py b/opentech/apply/activity/messaging.py
index c78a399c3..436c9337d 100644
--- a/opentech/apply/activity/messaging.py
+++ b/opentech/apply/activity/messaging.py
@@ -38,7 +38,11 @@ class AdapterBase:
message = self.message(message_type, **kwargs)
except KeyError:
return
- self.send_message(message, **kwargs)
+ if settings.SEND_MESSAGES:
+ self.send_message(message, **kwargs)
+ else:
+ messages.add_message(kwargs['request'], messages.INFO, message)
+
def send_message(self, message, **kwargs):
raise NotImplementedError()
diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index 7dae6e777..187dddda9 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -348,3 +348,8 @@ BLEACH_STRIP_COMMENTS = True
HIJACK_LOGIN_REDIRECT_URL = '/dashboard/'
HIJACK_LOGOUT_REDIRECT_URL = '/account/'
HIJACK_DECORATOR = 'opentech.apply.users.decorators.superuser_decorator'
+
+
+# Messaging Settings
+SEND_MESSAGES = env.get('SLACK_DESTINATION', 'false').lower() == 'true'
+SLACK_DESTINATION = env.get('SLACK_DESTINATION', None)
diff --git a/opentech/settings/production.py b/opentech/settings/production.py
index 380b1f0bc..131e63638 100644
--- a/opentech/settings/production.py
+++ b/opentech/settings/production.py
@@ -106,8 +106,6 @@ else:
}
-SLACK_DESTINATION = env.get('SLACK_DESTINATION', None)
-
# Logging
if 'LOG_DIR' in env:
--
GitLab