public/coins-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move "email thread participants" into utils

Browse source
This commit is contained in:
Scot Hacker 2018-03-14 00:22:37 -07:00
parent f853296aa8
commit 35cfd2eb39
2 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
todo/utils.py
View file

@ -5,7 +5,7 @@ from django.contrib.sites.models import Site
from django.core.mail import send_mail from django.core.mail import send_mail
from django.template.loader import render_to_string 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): def toggle_done(request, items):
@ -29,17 +29,35 @@ def toggle_deleted(request, deleted_items):
def send_notify_mail(request, new_task): 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. # Unassigned tasks should not try to notify.
if new_task.assigned_to: if new_task.assigned_to:
current_site = Site.objects.get_current() current_site = Site.objects.get_current()
email_subject = render_to_string("todo/email/assigned_subject.txt", {'task': new_task}) email_subject = render_to_string("todo/email/assigned_subject.txt", {'task': new_task})
email_body = render_to_string( email_body = render_to_string(
"todo/email/assigned_body.txt", "todo/email/assigned_body.txt",
{'task': new_task, 'site': current_site, }) {'task': new_task, 'site': current_site, })
try:
send_mail( send_mail(
email_subject, email_body, new_task.created_by.email, email_subject, email_body, new_task.created_by.email,
[new_task.assigned_to.email], fail_silently=False) [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))
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)

36
todo/views.py
View file

@ -16,7 +16,7 @@ from django.views.decorators.csrf import csrf_exempt
from todo import settings from todo import settings
from todo.forms import AddTaskListForm, AddItemForm, EditItemForm, AddExternalItemForm, SearchForm from todo.forms import AddTaskListForm, AddItemForm, EditItemForm, AddExternalItemForm, SearchForm
from todo.models import Item, TaskList, Comment from todo.models import Item, TaskList, Comment
from todo.utils import toggle_done, toggle_deleted, send_notify_mail from todo.utils import toggle_done, toggle_deleted, send_notify_mail, send_email_to_thread_participants
def check_user_allowed(user: User) -> HttpResponse: def check_user_allowed(user: User) -> HttpResponse:
@ -143,8 +143,9 @@ def list_detail(request, list_id=None, list_slug=None, view_completed=False):
@user_passes_test(check_user_allowed) @user_passes_test(check_user_allowed)
def task_detail(request, task_id: int) -> HttpResponse: def task_detail(request, task_id: int) -> HttpResponse:
"""View task details. Allow task details to be edited. """View task details. Allow task details to be edited. Process new comments on task.
""" """
task = get_object_or_404(Item, pk=task_id) task = get_object_or_404(Item, pk=task_id)
comment_list = Comment.objects.filter(task=task_id) comment_list = Comment.objects.filter(task=task_id)
@ -168,26 +169,8 @@ def task_detail(request, task_id: int) -> HttpResponse:
) )
c.save() c.save()
# And email comment to all people who have participated in this thread. send_email_to_thread_participants(request, task):
current_site = Site.objects.get_current() messages.success(request, "Notification email sent to thread participants.")
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 on it 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
try:
send_mail(email_subject, email_body, task.created_by.email, recip_list, fail_silently=False)
messages.success(request, "Comment sent to thread participants.")
except Exception as e:
messages.error(
request, "Comment saved but mail not sent. Contact your administrator. :: {}".format(e))
messages.success(request, "The task has been edited.") messages.success(request, "The task has been edited.")
@ -199,7 +182,14 @@ def task_detail(request, task_id: int) -> HttpResponse:
else: else:
thedate = datetime.datetime.now() thedate = datetime.datetime.now()
return render(request, 'todo/task_detail.html', locals()) context = {
"task": task,
"comment_list": comment_list,
"form": form,
"thedate": thedate,
}
return render(request, 'todo/task_detail.html', context)
@csrf_exempt @csrf_exempt