diff --git a/helpdesk/lib.py b/helpdesk/lib.py index 16c82758..0692213a 100644 --- a/helpdesk/lib.py +++ b/helpdesk/lib.py @@ -344,6 +344,7 @@ ORDER_COLUMN_CHOICES = Choices( ('8', 'assigned_to') ) + def query_tickets_by_args(objects, order_by, **kwargs): """ This function takes in a list of ticket objects from the views and throws it @@ -370,13 +371,13 @@ def query_tickets_by_args(objects, order_by, **kwargs): if search_value: queryset = queryset.filter(Q(id__icontains=search_value) | - Q(priority__icontains=search_value) | - Q(title__icontains=search_value) | - Q(queue__title__icontains=search_value) | - Q(status__icontains=search_value) | - Q(created__icontains=search_value) | - Q(due_date__icontains=search_value) | - Q(assigned_to__email__icontains=search_value)) + Q(priority__icontains=search_value) | + Q(title__icontains=search_value) | + Q(queue__title__icontains=search_value) | + Q(status__icontains=search_value) | + Q(created__icontains=search_value) | + Q(due_date__icontains=search_value) | + Q(assigned_to__email__icontains=search_value)) count = queryset.count() queryset = queryset.order_by(order_column)[start:start + length] @@ -385,4 +386,4 @@ def query_tickets_by_args(objects, order_by, **kwargs): 'count': count, 'total': total, 'draw': draw -} + } diff --git a/helpdesk/serializers.py b/helpdesk/serializers.py index 8422380b..e5c7dc7d 100644 --- a/helpdesk/serializers.py +++ b/helpdesk/serializers.py @@ -10,6 +10,7 @@ datatables for ticket_list.html. Called from staff.datatables_ticket_list. """ + class TicketSerializer(serializers.ModelSerializer): ticket = serializers.SerializerMethodField() assigned_to = serializers.SerializerMethodField() @@ -24,7 +25,7 @@ class TicketSerializer(serializers.ModelSerializer): fields = ('ticket', 'id', 'priority', 'title', 'queue', 'status', 'created', 'due_date', 'assigned_to', 'row_class') def get_ticket(self, obj): - return (str(obj.id)+" "+obj.ticket) + return (str(obj.id) + " " + obj.ticket) def get_status(self, obj): return (obj.get_status)