From 5da7069dbdd28f5e9c85521dbc278464741681a9 Mon Sep 17 00:00:00 2001 From: Timothy Hobbs Date: Mon, 13 Jan 2020 15:43:47 +0100 Subject: [PATCH] Add submitter email to ticket list --- helpdesk/serializers.py | 6 +++++- helpdesk/templates/helpdesk/ticket_list.html | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/helpdesk/serializers.py b/helpdesk/serializers.py index ef5ed27d..469fc92e 100644 --- a/helpdesk/serializers.py +++ b/helpdesk/serializers.py @@ -15,6 +15,7 @@ datatables for ticket_list.html. Called from staff.datatables_ticket_list. class DatatablesTicketSerializer(serializers.ModelSerializer): ticket = serializers.SerializerMethodField() assigned_to = serializers.SerializerMethodField() + submitter = serializers.SerializerMethodField() created = serializers.SerializerMethodField() due_date = serializers.SerializerMethodField() status = serializers.SerializerMethodField() @@ -26,7 +27,7 @@ class DatatablesTicketSerializer(serializers.ModelSerializer): model = Ticket # fields = '__all__' fields = ('ticket', 'id', 'priority', 'title', 'queue', 'status', - 'created', 'due_date', 'assigned_to', 'row_class', + 'created', 'due_date', 'assigned_to', 'submitter', 'row_class', 'time_spent') def get_queue(self, obj): @@ -53,6 +54,9 @@ class DatatablesTicketSerializer(serializers.ModelSerializer): else: return ("None") + def get_submitter(self, obj): + return obj.submitter_email + def get_time_spent(self, obj): return format_time_spent(obj.time_spent) diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index 03be65e2..8cdfd0b5 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -66,6 +66,7 @@ {% trans "Created" %} {% trans "Due Date" %} {% trans "Owner" %} + {% trans "Submitter" %} {% trans "Time Spent" %} @@ -358,6 +359,7 @@ } } }, + {"data": "submitter"}, {"data": "time_spent"}, ] });