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

Merge pull request #793 from askvortsov1/master

Browse Source 
Fixed syntax error in escalate_tickets.py
This commit is contained in:
Garret Wassermann 2020-01-07 10:04:10 -05:00 committed by GitHub
commit 66eef0a6b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpdesk/management/commands/escalate_tickets.py
View File

@ -105,7 +105,7 @@ def escalate_tickets(queues, verbose):
t.send(
{'submitter': ('escalated_submitter', context),
'ticket_cc': ('escalated_cc', context),
'assigned_to': ('escalated_owner', context)}
'assigned_to': ('escalated_owner', context)},
fail_silently=True,
)

4
helpdesk/serializers.py
View File

@ -46,8 +46,8 @@ class DatatablesTicketSerializer(serializers.ModelSerializer):
def get_assigned_to(self, obj):
if obj.assigned_to:
if obj.assigned_to.first_name:
return (obj.assigned_to.first_name)
if obj.assigned_to.get_full_name():
return (obj.assigned_to.get_full_name())
else:
return (obj.assigned_to.email)
else: