From 6df74f335cbaf53d3f3cc7978ace9f8be66cfb87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 22 Mar 2018 10:34:36 +0100 Subject: [PATCH] notifications: add settings for default duration (#22730) --- combo/apps/notifications/models.py | 6 ++++-- combo/settings.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/combo/apps/notifications/models.py b/combo/apps/notifications/models.py index 4b805a1..dbff0c3 100644 --- a/combo/apps/notifications/models.py +++ b/combo/apps/notifications/models.py @@ -104,12 +104,14 @@ class Notification(models.Model): ''' start_timestamp = start_timestamp or now() - if duration: + if end_timestamp: + pass + elif duration: if not isinstance(duration, timedelta): duration = timedelta(seconds=duration) end_timestamp = start_timestamp + duration else: - end_timestamp = end_timestamp or start_timestamp + timedelta(days=3) + end_timestamp = start_timestamp + timedelta(days=settings.COMBO_DEFAULT_NOTIFICATION_DURATION) defaults = { 'summary': summary, diff --git a/combo/settings.py b/combo/settings.py index 22d064c..367b603 100644 --- a/combo/settings.py +++ b/combo/settings.py @@ -298,6 +298,9 @@ SITE_BASE_URL = 'http://localhost' # we use 28s by default: timeout just before web server, which is usually 30s REQUESTS_TIMEOUT = 28 +# default duration of notifications (in days) +COMBO_DEFAULT_NOTIFICATION_DURATION = 3 + # hide work-in-progress/experimental/whatever cells for now BOOKING_CALENDAR_CELL_ENABLED = False NEWSLETTERS_CELL_ENABLED = False -- 2.16.2