extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-09 08:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ticket list code

Browse Source
This commit is contained in:
Timothy Hobbs
2019-10-11 12:41:06 +02:00
parent b862732512
commit 03d1c66dd6
5 changed files with 68 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
helpdesk/lib.py
View File

@ -38,7 +38,11 @@ def query_from_base64(b64data):
"""
Converts base64-encoded bytes object back to a query dict object.
"""
return json.loads(b64decode(b64data).decode('utf-8'))
query = {'search_string': ''}
query.update(json.loads(b64decode(b64data).decode('utf-8')))
if query['search_string'] is None:
query['search_string'] = ''
return query
def query_to_dict(results, descriptions):
@ -81,7 +85,7 @@ def apply_query(queryset, params):
filter = {key: params['filtering'][key]}
queryset = queryset.filter(**filter)
search = params.get('search_string', None)
search = params.get('search_string', '')
if search:
qset = (
Q(title__icontains=search) |
@ -257,7 +261,7 @@ def query_tickets_by_args(objects, order_by, **kwargs):
function filters existing dataset on search string and returns a filtered
filtered list. The `draw`, `length` etc parameters are for datatables to
display meta data on the table contents. The returning queryset is passed
to a Serializer called TicketSerializer in serializers.py.
to a Serializer called DatatablesTicketSerializer in serializers.py.
"""
draw = int(kwargs.get('draw', None)[0])
length = int(kwargs.get('length', None)[0])