UPD: split enable_email settings.
This commit is contained in:
2
TODO.txt
2
TODO.txt
@@ -1,7 +1,7 @@
|
|||||||
- getrennte settings für email benachrichtigung bei update und status update
|
|
||||||
- chainedform für update
|
- chainedform für update
|
||||||
- neue stati für facebook publishing und website publishing
|
- neue stati für facebook publishing und website publishing
|
||||||
|
|
||||||
|
- mehr export möglichkeiten für alle
|
||||||
- Save as Draft
|
- Save as Draft
|
||||||
- Done-Status
|
- Done-Status
|
||||||
- Tourenreferent managed Gruppen der Subreferenten
|
- Tourenreferent managed Gruppen der Subreferenten
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ from dav_base.config.apps import AppConfig as _AppConfig, DefaultSetting
|
|||||||
from . import signals
|
from . import signals
|
||||||
|
|
||||||
DEFAULT_SETTINGS = (
|
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_all', None),
|
||||||
DefaultSetting('group_manage_w', None),
|
DefaultSetting('group_manage_w', None),
|
||||||
DefaultSetting('group_manage_s', None),
|
DefaultSetting('group_manage_s', None),
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ from django.utils.translation import ugettext_lazy as _
|
|||||||
from dav_events.config import FieldInitial
|
from dav_events.config import FieldInitial
|
||||||
|
|
||||||
# E-Mails
|
# E-Mails
|
||||||
ENABLE_EMAIL_NOTIFICATIONS = False
|
ENABLE_EMAIL_ON_STATUS_UPDATE = False
|
||||||
|
ENABLE_EMAIL_ON_UPDATE = False
|
||||||
|
|
||||||
# Authorization Roles / Groups
|
# Authorization Roles / Groups
|
||||||
GROUP_MANAGE_ALL = 'Tourenreferenten'
|
GROUP_MANAGE_ALL = 'Tourenreferenten'
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ class BasicWorkflow(object):
|
|||||||
updater = kwargs.get('user')
|
updater = kwargs.get('user')
|
||||||
|
|
||||||
app_config = apps.get_containing_app_config(__package__)
|
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
|
return
|
||||||
|
|
||||||
if len(diff) < 1:
|
if len(diff) < 1:
|
||||||
@@ -160,7 +160,7 @@ class BasicWorkflow(object):
|
|||||||
updater = flag.user
|
updater = flag.user
|
||||||
|
|
||||||
app_config = apps.get_containing_app_config(__package__)
|
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
|
return
|
||||||
|
|
||||||
if flag.status.code == 'submitted':
|
if flag.status.code == 'submitted':
|
||||||
|
|||||||
Reference in New Issue
Block a user