send mail to report reviewers
This commit is contained in:
parent
cb467d7f54
commit
d5086f79c0
4 changed files with 57 additions and 3 deletions
|
@ -2359,7 +2359,7 @@ msgstr "Neuer Ortstitel"
|
||||||
|
|
||||||
#: c3nav/mapdata/models/report.py:75
|
#: c3nav/mapdata/models/report.py:75
|
||||||
msgid "you have to supply a title in at least one language"
|
msgid "you have to supply a title in at least one language"
|
||||||
msgstr "Du must das Feld {field} in mindestens einer Sprache ausfüllen."
|
msgstr "Du musst einen Titel in mindestens einer Sprache angeben"
|
||||||
|
|
||||||
#: c3nav/mapdata/models/report.py:76
|
#: c3nav/mapdata/models/report.py:76
|
||||||
msgid "location groups"
|
msgid "location groups"
|
||||||
|
@ -2768,7 +2768,7 @@ msgstr "Du meldest einen Fehler beim folgenden Ort:"
|
||||||
|
|
||||||
#: c3nav/site/templates/site/fragment_report_meta.html:6
|
#: c3nav/site/templates/site/fragment_report_meta.html:6
|
||||||
msgid "You are reporting an missing location at the following position:"
|
msgid "You are reporting an missing location at the following position:"
|
||||||
msgstr "Du meldest einen fehlenden Ort an der folgenden Stelle."
|
msgstr "Du meldest einen fehlenden Ort an der folgenden Stelle:"
|
||||||
|
|
||||||
#: c3nav/site/templates/site/fragment_report_meta.html:9
|
#: c3nav/site/templates/site/fragment_report_meta.html:9
|
||||||
msgid "You are reporting an issue with the following route:"
|
msgid "You are reporting an issue with the following route:"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import string
|
import string
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.contrib.auth import get_user_model
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
|
@ -11,6 +12,7 @@ from c3nav.mapdata.fields import I18nField
|
||||||
from c3nav.mapdata.models.locations import SpecificLocation
|
from c3nav.mapdata.models.locations import SpecificLocation
|
||||||
from c3nav.mapdata.utils.locations import get_location_by_id_for_request
|
from c3nav.mapdata.utils.locations import get_location_by_id_for_request
|
||||||
from c3nav.mapdata.utils.models import get_submodels
|
from c3nav.mapdata.utils.models import get_submodels
|
||||||
|
from c3nav.site.tasks import send_report_notification
|
||||||
|
|
||||||
|
|
||||||
def get_report_secret():
|
def get_report_secret():
|
||||||
|
@ -114,6 +116,33 @@ class Report(models.Model):
|
||||||
else:
|
else:
|
||||||
return cls.objects.none()
|
return cls.objects.none()
|
||||||
|
|
||||||
|
def get_affected_group_ids(self):
|
||||||
|
if self.category == 'missing-location':
|
||||||
|
return tuple(self.created_groups.values_list('pk', flat=True))
|
||||||
|
elif self.category == 'location-issue':
|
||||||
|
return tuple(self.location.get_child().groups.values_list('pk', flat=True))
|
||||||
|
return ()
|
||||||
|
|
||||||
|
def get_reviewers_qs(self):
|
||||||
|
return get_user_model().objects.filter(
|
||||||
|
Q(permissions__review_all_reports=True) |
|
||||||
|
Q(permissions__review_group_reports__in=self.get_affected_group_ids())
|
||||||
|
)
|
||||||
|
|
||||||
|
def notify_reviewers(self):
|
||||||
|
reviewers = tuple(self.get_reviewers_qs().values_list('pk', flat=True))
|
||||||
|
send_report_notification.delay(pk=self.pk,
|
||||||
|
title=self.title,
|
||||||
|
author=self.author.username,
|
||||||
|
description=self.description,
|
||||||
|
reviewers=reviewers)
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
created = self.pk is None
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
if created:
|
||||||
|
self.notify_reviewers()
|
||||||
|
|
||||||
|
|
||||||
class ReportUpdate(models.Model):
|
class ReportUpdate(models.Model):
|
||||||
report = models.ForeignKey(Report, on_delete=models.CASCADE)
|
report = models.ForeignKey(Report, on_delete=models.CASCADE)
|
||||||
|
|
25
src/c3nav/site/tasks.py
Normal file
25
src/c3nav/site/tasks.py
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
from django.core.mail import send_mail
|
||||||
|
|
||||||
|
from c3nav.celery import app
|
||||||
|
|
||||||
|
logger = logging.getLogger('c3nav')
|
||||||
|
|
||||||
|
|
||||||
|
@app.task(bind=True, max_retries=3)
|
||||||
|
def send_report_notification(self, pk, author, title, description, reviewers):
|
||||||
|
subject = '[c3nav] New Report by %s: %s' % (author, title)
|
||||||
|
|
||||||
|
for user in User.objects.filter(pk=reviewers):
|
||||||
|
if not user.email:
|
||||||
|
continue
|
||||||
|
text = (
|
||||||
|
('Hi %s!\n\n' % user.username) +
|
||||||
|
('A new Report has ben submitted by %s:\n\n' % author) +
|
||||||
|
('---\n\n') +
|
||||||
|
(title+'\n\n'+description)
|
||||||
|
)
|
||||||
|
send_mail(subject, text, settings.MAIL_FROM, [user.email])
|
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<main class="account">
|
<main class="account">
|
||||||
|
{% include 'site/fragment_messages.html' %}
|
||||||
<h2>{% trans 'Report' %}: {{ report.title }}</h2>
|
<h2>{% trans 'Report' %}: {{ report.title }}</h2>
|
||||||
<p><em>
|
<p><em>
|
||||||
{% if report.open %}
|
{% if report.open %}
|
||||||
|
@ -19,7 +20,6 @@
|
||||||
–
|
–
|
||||||
{{ report.created }}
|
{{ report.created }}
|
||||||
</em></p>
|
</em></p>
|
||||||
{% include 'site/fragment_messages.html' %}
|
|
||||||
{% include 'site/fragment_report_meta.html' %}
|
{% include 'site/fragment_report_meta.html' %}
|
||||||
|
|
||||||
{% for field in form %}
|
{% for field in form %}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue