Show username of ticket's owner in ticket_list if user has no full name nor email

This commit is contained in:
Benbb96 2020-10-08 22:47:52 +02:00
parent 5b44a3aca6
commit 37713db32a

View File

@ -32,28 +32,30 @@ class DatatablesTicketSerializer(serializers.ModelSerializer):
'time_spent', 'kbitem') 'time_spent', 'kbitem')
def get_queue(self, obj): def get_queue(self, obj):
return ({"title": obj.queue.title, "id": obj.queue.id}) return {"title": obj.queue.title, "id": obj.queue.id}
def get_ticket(self, obj): def get_ticket(self, obj):
return (str(obj.id) + " " + obj.ticket) return str(obj.id) + " " + obj.ticket
def get_status(self, obj): def get_status(self, obj):
return (obj.get_status) return obj.get_status
def get_created(self, obj): def get_created(self, obj):
return (humanize.naturaltime(obj.created)) return humanize.naturaltime(obj.created)
def get_due_date(self, obj): def get_due_date(self, obj):
return (humanize.naturaltime(obj.due_date)) return humanize.naturaltime(obj.due_date)
def get_assigned_to(self, obj): def get_assigned_to(self, obj):
if obj.assigned_to: if obj.assigned_to:
if obj.assigned_to.get_full_name(): if obj.assigned_to.get_full_name():
return (obj.assigned_to.get_full_name()) return obj.assigned_to.get_full_name()
elif obj.assigned_to.email:
return obj.assigned_to.email
else: else:
return (obj.assigned_to.email) return obj.assigned_to.username
else: else:
return ("None") return "None"
def get_submitter(self, obj): def get_submitter(self, obj):
return obj.submitter_email return obj.submitter_email
@ -62,7 +64,7 @@ class DatatablesTicketSerializer(serializers.ModelSerializer):
return format_time_spent(obj.time_spent) return format_time_spent(obj.time_spent)
def get_row_class(self, obj): def get_row_class(self, obj):
return (obj.get_priority_css_class) return obj.get_priority_css_class
def get_kbitem(self, obj): def get_kbitem(self, obj):
return obj.kbitem.title if obj.kbitem else "" return obj.kbitem.title if obj.kbitem else ""