Merge pull request #793 from askvortsov1/master

Fixed syntax error in escalate_tickets.py
django-helpdesk · Jan 7, 2020 · 66eef0a · 66eef0a
2 parents c143cb3 + 377e1c3
commit 66eef0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/helpdesk/management/commands/escalate_tickets.py b/helpdesk/management/commands/escalate_tickets.py
@@ -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,
             )
 

diff --git a/helpdesk/serializers.py b/helpdesk/serializers.py
@@ -46,8 +46,8 @@ def get_due_date(self, obj):
 
     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: