diff --git a/helpdesk/query.py b/helpdesk/query.py index c1808594..8e42dcf1 100644 --- a/helpdesk/query.py +++ b/helpdesk/query.py @@ -85,7 +85,7 @@ DATATABLES_ORDER_COLUMN_CHOICES = Choices( ('6', 'due_date'), ('7', 'assigned_to'), ('8', 'submitter_email'), - #('9', 'time_spent'), + # ('9', 'time_spent'), ('10', 'kbitem'), ) diff --git a/helpdesk/serializers.py b/helpdesk/serializers.py index 7dd51346..c96f5b86 100644 --- a/helpdesk/serializers.py +++ b/helpdesk/serializers.py @@ -66,4 +66,3 @@ class DatatablesTicketSerializer(serializers.ModelSerializer): def get_kbitem(self, obj): return obj.kbitem.title if obj.kbitem else "" - diff --git a/helpdesk/tests/test_query.py b/helpdesk/tests/test_query.py index c722c723..e861f81f 100644 --- a/helpdesk/tests/test_query.py +++ b/helpdesk/tests/test_query.py @@ -61,12 +61,13 @@ class QueryTests(TestCase): response = self.client.get(reverse('helpdesk:datatables_ticket_list', args=[query])) self.assertEqual( response.json(), - {"data": - [{"ticket": "1 [test_queue-1]", "id": 1, "priority": 3, "title": "unassigned to kbitem", "queue": {"title": "Test queue", "id": 1}, "status": "Open", "created": "now", "due_date": None, "assigned_to": "None", "submitter": None, "row_class": "", "time_spent": "", "kbitem": ""}, - {"ticket": "2 [test_queue-2]", "id": 2, "priority": 3, "title": "assigned to kbitem", "queue": {"title": "Test queue", "id": 1}, "status": "Open", "created": "now", "due_date": None, "assigned_to": "None", "submitter": None, "row_class": "", "time_spent": "", "kbitem": "KBItem 1"}], - "recordsFiltered": 2, - "recordsTotal": 2, - "draw": 0, + { + "data": + [{"ticket": "1 [test_queue-1]", "id": 1, "priority": 3, "title": "unassigned to kbitem", "queue": {"title": "Test queue", "id": 1}, "status": "Open", "created": "now", "due_date": None, "assigned_to": "None", "submitter": None, "row_class": "", "time_spent": "", "kbitem": ""}, + {"ticket": "2 [test_queue-2]", "id": 2, "priority": 3, "title": "assigned to kbitem", "queue": {"title": "Test queue", "id": 1}, "status": "Open", "created": "now", "due_date": None, "assigned_to": "None", "submitter": None, "row_class": "", "time_spent": "", "kbitem": "KBItem 1"}], + "recordsFiltered": 2, + "recordsTotal": 2, + "draw": 0, }, ) @@ -78,11 +79,12 @@ class QueryTests(TestCase): response = self.client.get(reverse('helpdesk:datatables_ticket_list', args=[query])) self.assertEqual( response.json(), - {"data": - [{"ticket": "2 [test_queue-2]", "id": 2, "priority": 3, "title": "assigned to kbitem", "queue": {"title": "Test queue", "id": 1}, "status": "Open", "created": "now", "due_date": None, "assigned_to": "None", "submitter": None, "row_class": "", "time_spent": "", "kbitem": "KBItem 1"}], - "recordsFiltered": 1, - "recordsTotal": 1, - "draw": 0, + { + "data": + [{"ticket": "2 [test_queue-2]", "id": 2, "priority": 3, "title": "assigned to kbitem", "queue": {"title": "Test queue", "id": 1}, "status": "Open", "created": "now", "due_date": None, "assigned_to": "None", "submitter": None, "row_class": "", "time_spent": "", "kbitem": "KBItem 1"}], + "recordsFiltered": 1, + "recordsTotal": 1, + "draw": 0, }, ) @@ -94,10 +96,11 @@ class QueryTests(TestCase): response = self.client.get(reverse('helpdesk:datatables_ticket_list', args=[query])) self.assertEqual( response.json(), - {"data": - [{"ticket": "2 [test_queue-2]", "id": 2, "priority": 3, "title": "assigned to kbitem", "queue": {"title": "Test queue", "id": 1}, "status": "Open", "created": "now", "due_date": None, "assigned_to": "None", "submitter": None, "row_class": "", "time_spent": "", "kbitem": "KBItem 1"}], - "recordsFiltered": 1, - "recordsTotal": 1, - "draw": 0, + { + "data": + [{"ticket": "2 [test_queue-2]", "id": 2, "priority": 3, "title": "assigned to kbitem", "queue": {"title": "Test queue", "id": 1}, "status": "Open", "created": "now", "due_date": None, "assigned_to": "None", "submitter": None, "row_class": "", "time_spent": "", "kbitem": "KBItem 1"}], + "recordsFiltered": 1, + "recordsTotal": 1, + "draw": 0, }, )