0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Fix autocompleteSort with multiple keys (fixes #2893)

Browse source 
QuerySet.order_by() takes each key as a separate argument, not as a
single comma-separated string.
This commit is contained in:
Will Thompson 2016-03-02 15:20:23 +00:00 • committed by j
commit c6f9f87c8e
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pandora/entity/views.py
View file

@ -118,16 +118,16 @@ def autocompleteEntities(request, data):
if order_by:
for o in order_by:
if o['operator'] != '-':
o['operator'] = ''
order_by = ','.join(['%(operator)s%(key)s' % o for o in order_by])
o['operator'] = ''
order_by = ['%(operator)s%(key)s' % o for o in order_by]
else:
order_by = 'name_sort'
order_by = ['name_sort']
qs = models.Entity.objects.filter(type=data['key'])
if data['value']:
k, v = namePredicate(op, data['value'])
qs = qs.filter(**{k: v})
qs = qs.order_by(order_by)
qs = qs.order_by(*order_by)
if op != '$':
value_lower = data['value'].lower()
matches = []