holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PEP8 formatting fixes

Browse Source
This commit is contained in:
Garret Wassermann 2018-10-15 13:56:54 -04:00
parent fc028334d9
commit 2b11a0e11a
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
helpdesk/lib.py
View File

@ -344,6 +344,7 @@ ORDER_COLUMN_CHOICES = Choices(
('8', 'assigned_to') ('8', 'assigned_to')
) )
def query_tickets_by_args(objects, order_by, **kwargs): def query_tickets_by_args(objects, order_by, **kwargs):
""" """
This function takes in a list of ticket objects from the views and throws it 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: if search_value:
queryset = queryset.filter(Q(id__icontains=search_value) | queryset = queryset.filter(Q(id__icontains=search_value) |
Q(priority__icontains=search_value) | Q(priority__icontains=search_value) |
Q(title__icontains=search_value) | Q(title__icontains=search_value) |
Q(queue__title__icontains=search_value) | Q(queue__title__icontains=search_value) |
Q(status__icontains=search_value) | Q(status__icontains=search_value) |
Q(created__icontains=search_value) | Q(created__icontains=search_value) |
Q(due_date__icontains=search_value) | Q(due_date__icontains=search_value) |
Q(assigned_to__email__icontains=search_value)) Q(assigned_to__email__icontains=search_value))
count = queryset.count() count = queryset.count()
queryset = queryset.order_by(order_column)[start:start + length] queryset = queryset.order_by(order_column)[start:start + length]
@ -385,4 +386,4 @@ def query_tickets_by_args(objects, order_by, **kwargs):
'count': count, 'count': count,
'total': total, 'total': total,
'draw': draw 'draw': draw
} }

3
helpdesk/serializers.py
View File

@ -10,6 +10,7 @@ datatables for ticket_list.html. Called from staff.datatables_ticket_list.
""" """
class TicketSerializer(serializers.ModelSerializer): class TicketSerializer(serializers.ModelSerializer):
ticket = serializers.SerializerMethodField() ticket = serializers.SerializerMethodField()
assigned_to = 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') fields = ('ticket', 'id', 'priority', 'title', 'queue', 'status', 'created', 'due_date', 'assigned_to', 'row_class')
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)