From 3d88e313daa5dd6310f2bd637c771039b39bfbe8 Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Wed, 21 Nov 2018 15:20:13 +0100 Subject: [PATCH] FIX: fixed missing name of acceptor in email messages about accepted mails. --- dav_events/emails.py | 19 +++++++++++++++---- .../dav_events/emails/event_accepted.txt | 2 +- .../dav_events/emails/event_submitted.txt | 2 +- .../dav_events/emails/event_to_accept.txt | 2 +- .../dav_events/emails/event_to_publish.txt | 2 +- .../dav_events/emails/event_updated.txt | 2 +- dav_events/workflow.py | 8 +++++--- 7 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dav_events/emails.py b/dav_events/emails.py index f18d5cb..b8d5121 100644 --- a/dav_events/emails.py +++ b/dav_events/emails.py @@ -90,15 +90,15 @@ class EventUpdatedMail(AbstractEventMail): _subject = u'Veranstaltung geändert' _template_name = 'dav_events/emails/event_updated.txt' - def __init__(self, diff=None, editor=None, *args, **kwargs): - self._diff = diff + def __init__(self, editor=None, diff=None, *args, **kwargs): self._editor = editor + self._diff = diff super(EventUpdatedMail, self).__init__(*args, **kwargs) def _get_context_data(self, extra_context=None): context = super(EventUpdatedMail, self)._get_context_data(extra_context=extra_context) + context['editor'] = self._editor context['diff'] = self._diff - context['editor'] = self._editor.get_full_name() return context @@ -125,17 +125,28 @@ class EventAcceptedMail(AbstractEventMail): _subject = u'Veranstaltung freigegeben' _template_name = 'dav_events/emails/event_accepted.txt' + def __init__(self, editor=None, *args, **kwargs): + self._editor = editor + super(EventAcceptedMail, self).__init__(*args, **kwargs) + + def _get_context_data(self, extra_context=None): + context = super(EventAcceptedMail, self)._get_context_data(extra_context=extra_context) + context['editor'] = self._editor + return context + class EventToPublishMail(AbstractEventMail): _subject = u'Veranstaltung veröffentlichen' _template_name = 'dav_events/emails/event_to_publish.txt' - def __init__(self, confirm_publication_action=None, *args, **kwargs): + def __init__(self, editor=None, confirm_publication_action=None, *args, **kwargs): + self._editor = editor self._confirm_publication_action = confirm_publication_action super(EventToPublishMail, self).__init__(*args, **kwargs) def _get_context_data(self, extra_context=None): context = super(EventToPublishMail, self)._get_context_data(extra_context=extra_context) + context['editor'] = self._editor context['confirm_publication_url'] = self._confirm_publication_action.get_absolute_url() return context diff --git a/dav_events/templates/dav_events/emails/event_accepted.txt b/dav_events/templates/dav_events/emails/event_accepted.txt index 5a8299c..2dd33f7 100644 --- a/dav_events/templates/dav_events/emails/event_accepted.txt +++ b/dav_events/templates/dav_events/emails/event_accepted.txt @@ -1,6 +1,6 @@ Hallo {{ recipient.first_name }}, -deine Veranstaltung wurde {% if event.accepted_by %}von {{ event.accepted_by.get_full_name }} {% endif %}freigegeben. +deine Veranstaltung wurde {% if editor %}von {{ editor.get_full_name }} {% endif %}freigegeben. Die Redaktion wurde informiert, um deine Veranstaltung zu veröffentlichen. Link zur Veranstaltung: diff --git a/dav_events/templates/dav_events/emails/event_submitted.txt b/dav_events/templates/dav_events/emails/event_submitted.txt index 7ac1139..4347f52 100644 --- a/dav_events/templates/dav_events/emails/event_submitted.txt +++ b/dav_events/templates/dav_events/emails/event_submitted.txt @@ -1,6 +1,6 @@ Hallo {{ recipient.first_name }}, -du hast eine neue Veranstaltung eingereicht. +eine Veranstaltung wurde in deinem Namen eingereicht. Die entsprechenden Referenten wurden informiert, um deine Veranstaltung frei zu geben. Link zur Veranstaltung: diff --git a/dav_events/templates/dav_events/emails/event_to_accept.txt b/dav_events/templates/dav_events/emails/event_to_accept.txt index 31e97a1..68d79f0 100644 --- a/dav_events/templates/dav_events/emails/event_to_accept.txt +++ b/dav_events/templates/dav_events/emails/event_to_accept.txt @@ -1,6 +1,6 @@ Hallo {{ recipient.first_name }}, -{{ trainer_firstname }} {{ trainer_familyname }} hat eine neue Veranstaltung eingereicht. +{{ trainer_firstname }} {{ trainer_familyname }} hat eine Veranstaltung eingereicht. Der folgende Link führt zur Veranstaltung: {{ base_url }}{{ event.get_absolute_url }} diff --git a/dav_events/templates/dav_events/emails/event_to_publish.txt b/dav_events/templates/dav_events/emails/event_to_publish.txt index 9c06881..07f0c54 100644 --- a/dav_events/templates/dav_events/emails/event_to_publish.txt +++ b/dav_events/templates/dav_events/emails/event_to_publish.txt @@ -1,7 +1,7 @@ {% load i18n %}Hallo {{ recipient.first_name }}, {{ trainer_firstname }} {{ trainer_familyname }} hat eine neue Veranstaltung eingereicht. -Die Veranstaltung wurde {% if event.accepted_by %}von {{ event.accepted_by.get_full_name }} {% endif %}zur Veröffentlichung frei gegeben. +Die Veranstaltung wurde {% if editor %}von {{ editor.get_full_name }} {% endif %}zur Veröffentlichung frei gegeben. Der folgende Link führt zur Veranstaltung: {{ base_url }}{{ event.get_absolute_url }} diff --git a/dav_events/templates/dav_events/emails/event_updated.txt b/dav_events/templates/dav_events/emails/event_updated.txt index 2c8ebfe..7359a22 100644 --- a/dav_events/templates/dav_events/emails/event_updated.txt +++ b/dav_events/templates/dav_events/emails/event_updated.txt @@ -1,6 +1,6 @@ Hallo {{ recipient.first_name }}, -{{ editor }} hat die folgende Veranstaltung geändert: +{{ editor.get_full_name|default:'Jemand' }} hat die folgende Veranstaltung geändert: {{ event }} Link zur Veranstaltung: diff --git a/dav_events/workflow.py b/dav_events/workflow.py index 8416bad..2cf5a89 100644 --- a/dav_events/workflow.py +++ b/dav_events/workflow.py @@ -25,13 +25,14 @@ def email_event_update(sender, **kwargs): for recipient in recipients: if recipient.email and recipient.email != updater.email: - email = emails.EventUpdatedMail(recipient=recipient, event=event, diff=diff, editor=updater) + email = emails.EventUpdatedMail(recipient=recipient, event=event, editor=updater, diff=diff) email.send() def email_event_status_update(sender, **kwargs): event = kwargs.get('event') flag = kwargs.get('flag') + updator = flag.user app_config = apps.get_containing_app_config(__package__) if not app_config.settings.enable_email_notifications: @@ -61,7 +62,7 @@ def email_event_status_update(sender, **kwargs): elif flag.status.code == 'accepted': # Inform event owner about the acceptance of his event. if event.owner.email: - email = emails.EventAcceptedMail(recipient=event.owner, event=event) + email = emails.EventAcceptedMail(recipient=event.owner, event=event, editor=updator) email.send() # Inform publishers that they have to publish the event. @@ -75,5 +76,6 @@ def email_event_status_update(sender, **kwargs): action = OneClickAction(command='EP') action.parameters = '{event},{user}'.format(event=event.id, user=recipient.id) action.save() - email = emails.EventToPublishMail(recipient=recipient, event=event, confirm_publication_action=action) + email = emails.EventToPublishMail(recipient=recipient, event=event, editor=updator, + confirm_publication_action=action) email.send()