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

fix sort of static edits

Browse source
This commit is contained in:
j 2016-08-23 13:24:08 +02:00
parent 9685c7e4a5
commit 97a46dceb0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pandora/edit/views.py
View file

@ -166,7 +166,7 @@ def _order_clips(edit, sort):
if len(sort) == 1: if len(sort) == 1:
for s in settings.CONFIG['user']['ui']['editSort']: for s in settings.CONFIG['user']['ui']['editSort']:
if (edit.type == 'smart' and s['key'] == 'index') \ if (edit.type == 'smart' and s['key'] == 'index') \
or s['key'] == sort[0]['key']: or s['key'] == sort[0]['key']:
continue continue
sort.append(s) sort.append(s)
for e in sort: for e in sort:
@ -174,7 +174,7 @@ def _order_clips(edit, sort):
if operator != '-': if operator != '-':
operator = '' operator = ''
key = e['key'] key = e['key']
#fixme, random should be clip random # fixme, random should be clip random
if key not in ('index', 'in', 'out', 'position', 'hue', 'saturation', 'lightness', 'volume', 'duration', 'text'): if key not in ('index', 'in', 'out', 'position', 'hue', 'saturation', 'lightness', 'volume', 'duration', 'text'):
key = "item__sort__%s" % key key = "item__sort__%s" % key
key = { key = {
@ -187,7 +187,10 @@ def _order_clips(edit, sort):
order = '%s%s' % (operator, key) order = '%s%s' % (operator, key)
order_by.append(order) order_by.append(order)
if order_by: if order_by:
qs = qs.order_by(*order_by, nulls_last=True) if edit.type == 'static':
qs = qs.order_by(*order_by)
else:
qs = qs.order_by(*order_by, nulls_last=True)
qs = qs.distinct() qs = qs.distinct()
return qs return qs