Move "email thread participants" into utils
This commit is contained in:
parent
f853296aa8
commit
35cfd2eb39
2 changed files with 39 additions and 31 deletions
|
@ -5,7 +5,7 @@ from django.contrib.sites.models import Site
|
|||
from django.core.mail import send_mail
|
||||
from django.template.loader import render_to_string
|
||||
|
||||
from todo.models import Item
|
||||
from todo.models import Item, TaskList, Comment
|
||||
|
||||
|
||||
def toggle_done(request, items):
|
||||
|
@ -29,17 +29,35 @@ def toggle_deleted(request, deleted_items):
|
|||
|
||||
|
||||
def send_notify_mail(request, new_task):
|
||||
# Send email to assignee when task is assigned to someone else.
|
||||
# Send email to assignee if task is assigned to someone other than submittor.
|
||||
# Unassigned tasks should not try to notify.
|
||||
|
||||
if new_task.assigned_to:
|
||||
current_site = Site.objects.get_current()
|
||||
email_subject = render_to_string("todo/email/assigned_subject.txt", {'task': new_task})
|
||||
email_body = render_to_string(
|
||||
"todo/email/assigned_body.txt",
|
||||
{'task': new_task, 'site': current_site, })
|
||||
try:
|
||||
send_mail(
|
||||
email_subject, email_body, new_task.created_by.email,
|
||||
[new_task.assigned_to.email], fail_silently=False)
|
||||
except Exception as e:
|
||||
messages.error(request, "Task saved but mail not sent. Contact your administrator.: {}".format(e))
|
||||
|
||||
send_mail(
|
||||
email_subject, email_body, new_task.created_by.email,
|
||||
[new_task.assigned_to.email], fail_silently=False)
|
||||
|
||||
|
||||
def send_email_to_thread_participants(request, task):
|
||||
# Notify all previous commentors on a Task about a new comment.
|
||||
|
||||
current_site = Site.objects.get_current()
|
||||
email_subject = render_to_string("todo/email/assigned_subject.txt", {'task': task})
|
||||
email_body = render_to_string(
|
||||
"todo/email/newcomment_body.txt",
|
||||
{'task': task, 'body': request.POST['comment-body'], 'site': current_site, 'user': request.user}
|
||||
)
|
||||
|
||||
# Get list of all thread participants - everyone who has commented, plus task creator.
|
||||
commenters = Comment.objects.filter(task=task)
|
||||
recip_list = [ca.author.email for ca in commenters]
|
||||
recip_list.append(task.created_by.email)
|
||||
recip_list = list(set(recip_list)) # Eliminate duplicates
|
||||
|
||||
send_mail(email_subject, email_body, task.created_by.email, recip_list, fail_silently=False)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue