holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From gettatr to get, because dict doesn't contatin attributes.

Browse Source 
More readable if statement.
This commit is contained in:
vlad.vyazovetskov 2015-11-12 17:31:14 +03:00
parent 387cc413a0
commit 0a3171a024
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
helpdesk/views/api.py
View File

@ -202,7 +202,7 @@ class API:
context = safe_template_context(ticket) context = safe_template_context(ticket)
context['comment'] = f.comment context['comment'] = f.comment
messages_sent_to = [] messages_sent_to = []
if public and ticket.submitter_email: if public and ticket.submitter_email:
@ -237,14 +237,20 @@ class API:
) )
messages_sent_to.append(ticket.queue.updated_ticket_cc) messages_sent_to.append(ticket.queue.updated_ticket_cc)
if ticket.assigned_to and self.request.user != ticket.assigned_to and getattr(ticket.assigned_to.usersettings.settings, 'email_on_ticket_apichange', False) and ticket.assigned_to.email and ticket.assigned_to.email not in messages_sent_to: if (
ticket.assigned_to and
self.request.user != ticket.assigned_to and
ticket.assigned_to.usersettings.settings.get('email_on_ticket_apichange', False) and
ticket.assigned_to.email and
ticket.assigned_to.email not in messages_sent_to
):
send_templated_mail( send_templated_mail(
'updated_owner', 'updated_owner',
context, context,
recipients=ticket.assigned_to.email, recipients=ticket.assigned_to.email,
sender=ticket.queue.from_address, sender=ticket.queue.from_address,
fail_silently=True, fail_silently=True,
) )
ticket.save() ticket.save()
@ -276,7 +282,7 @@ class API:
context['resolution'] = f.comment context['resolution'] = f.comment
subject = '%s %s (Resolved)' % (ticket.ticket, ticket.title) subject = '%s %s (Resolved)' % (ticket.ticket, ticket.title)
messages_sent_to = [] messages_sent_to = []
if ticket.submitter_email: if ticket.submitter_email: