From 66365cadee7bee24567f8ea0bc0c578232b79728 Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Thu, 20 Dec 2018 16:41:38 +0100 Subject: [PATCH] UPD: split enable_email settings. --- TODO.txt | 2 +- dav_events/apps.py | 3 ++- dav_events/django_project_config/settings-dav_events.py | 3 ++- dav_events/workflow.py | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/TODO.txt b/TODO.txt index ee88bca..ecd2d7f 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,7 +1,7 @@ -- getrennte settings für email benachrichtigung bei update und status update - chainedform für update - neue stati für facebook publishing und website publishing +- mehr export möglichkeiten für alle - Save as Draft - Done-Status - Tourenreferent managed Gruppen der Subreferenten diff --git a/dav_events/apps.py b/dav_events/apps.py index 39d8f06..359494f 100644 --- a/dav_events/apps.py +++ b/dav_events/apps.py @@ -5,7 +5,8 @@ from dav_base.config.apps import AppConfig as _AppConfig, DefaultSetting from . import signals DEFAULT_SETTINGS = ( - DefaultSetting('enable_email_notifications', False), + DefaultSetting('enable_email_on_status_update', False), + DefaultSetting('enable_email_on_update', False), DefaultSetting('group_manage_all', None), DefaultSetting('group_manage_w', None), DefaultSetting('group_manage_s', None), diff --git a/dav_events/django_project_config/settings-dav_events.py b/dav_events/django_project_config/settings-dav_events.py index 7faedfa..78ac46c 100644 --- a/dav_events/django_project_config/settings-dav_events.py +++ b/dav_events/django_project_config/settings-dav_events.py @@ -3,7 +3,8 @@ from django.utils.translation import ugettext_lazy as _ from dav_events.config import FieldInitial # E-Mails -ENABLE_EMAIL_NOTIFICATIONS = False +ENABLE_EMAIL_ON_STATUS_UPDATE = False +ENABLE_EMAIL_ON_UPDATE = False # Authorization Roles / Groups GROUP_MANAGE_ALL = 'Tourenreferenten' diff --git a/dav_events/workflow.py b/dav_events/workflow.py index 37d7076..d744ee5 100644 --- a/dav_events/workflow.py +++ b/dav_events/workflow.py @@ -130,7 +130,7 @@ class BasicWorkflow(object): updater = kwargs.get('user') app_config = apps.get_containing_app_config(__package__) - if not app_config.settings.enable_email_notifications: + if not app_config.settings.enable_email_on_update: return if len(diff) < 1: @@ -160,7 +160,7 @@ class BasicWorkflow(object): updater = flag.user app_config = apps.get_containing_app_config(__package__) - if not app_config.settings.enable_email_notifications: + if not app_config.settings.enable_email_on_status_update: return if flag.status.code == 'submitted':