extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-06-03 00:15:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

UPDATED: Moving TicketCC notifications to the end of the process so there's no need to add / subtract recipients lists (queue cc account etc).

Browse Source
This commit is contained in:
Bruno Tikami 2016-02-20 17:35:17 -02:00
parent 75a5556317
commit 0f346924fb
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
helpdesk/management/commands/get_email.py
View File

@ -173,6 +173,7 @@ def create_ticket_cc(ticket, cc_list):
# Local import to deal with non-defined / circular reference problem # Local import to deal with non-defined / circular reference problem
from helpdesk.views.staff import User, subscribe_to_ticket_updates from helpdesk.views.staff import User, subscribe_to_ticket_updates
new_ticket_ccs = []
for cced_email in cc_list: for cced_email in cc_list:
user = None user = None
@ -183,7 +184,9 @@ def create_ticket_cc(ticket, cc_list):
pass pass
ticket_cc = subscribe_to_ticket_updates(ticket=ticket, user=user, email=cced_email) ticket_cc = subscribe_to_ticket_updates(ticket=ticket, user=user, email=cced_email)
new_ticket_ccs.append(ticket_cc)
return new_ticket_ccs
def create_object_from_email_message(message, ticket_id, payload, files, quiet): def create_object_from_email_message(message, ticket_id, payload, files, quiet):
@ -269,23 +272,16 @@ def create_object_from_email_message(message, ticket_id, payload, files, quiet):
context = safe_template_context(ticket) context = safe_template_context(ticket)
new_ticket_ccs = []
if cc_list is not None: if cc_list is not None:
create_ticket_cc(ticket, cc_list.split(',')) new_ticket_ccs = create_ticket_cc(ticket, cc_list.split(','))
ticket_cc_list = TicketCC.objects.filter(ticket=ticket).all().values_list('email', flat=True) notification_template = None
if ticket_cc_list.count() > 0 :
send_templated_mail(
'newticket_cc',
context,
recipients=ticket_cc_list,
sender=queue.from_address,
fail_silently=True,
extra_headers={'In-Reply-To': message_id},
)
if new: if new:
notification_template = 'newticket_cc'
if sender_email: if sender_email:
send_templated_mail( send_templated_mail(
'newticket_submitter', 'newticket_submitter',
@ -297,6 +293,7 @@ def create_object_from_email_message(message, ticket_id, payload, files, quiet):
) )
if queue.new_ticket_cc: if queue.new_ticket_cc:
send_templated_mail( send_templated_mail(
'newticket_cc', 'newticket_cc',
context, context,
@ -317,6 +314,9 @@ def create_object_from_email_message(message, ticket_id, payload, files, quiet):
) )
else: else:
notification_template = 'updated_cc'
context.update(comment=f.comment) context.update(comment=f.comment)
if ticket.status == Ticket.REOPENED_STATUS: if ticket.status == Ticket.REOPENED_STATUS:
@ -342,6 +342,23 @@ def create_object_from_email_message(message, ticket_id, payload, files, quiet):
fail_silently=True, fail_silently=True,
) )
notifications_to_be_sent = []
ticket_cc_list = TicketCC.objects.filter(ticket=ticket).all().values_list('email', flat=True)
for email in ticket_cc_list :
notifications_to_be_sent.append(email)
if len(notifications_to_be_sent):
send_templated_mail(
notification_template,
context,
recipients=notifications_to_be_sent,
sender=queue.from_address,
fail_silently=True,
extra_headers={'In-Reply-To': message_id},
)
return ticket return ticket