decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

really fix sortClips for smart edits

Browse source
This commit is contained in:
j 2014-02-07 09:49:25 +00:00
parent 920e6ccff9
commit cfe8691f1a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pandora/edit/views.py
View file

@ -155,7 +155,8 @@ def orderClips(request):
return render_to_json_response(response) return render_to_json_response(response)
actions.register(orderClips, cache=False) actions.register(orderClips, cache=False)
def _order_clips(qs, sort): def _order_clips(edit, sort):
qs = edit.get_clips()
order_by = [] order_by = []
for e in sort: for e in sort:
operator = e['operator'] operator = e['operator']
@ -169,7 +170,7 @@ def _order_clips(qs, sort):
'position': 'start', 'position': 'start',
'in': 'start', 'in': 'start',
'out': 'end', 'out': 'end',
'text': 'annotation__sortvalue', 'text': 'annotation__sortvalue' if edit.type == 'static' else 'annotations__sortvalue',
'item__sort__item': 'item__sort__itemId', 'item__sort__item': 'item__sort__itemId',
}.get(key, key) }.get(key, key)
order = '%s%s' % (operator, key) order = '%s%s' % (operator, key)
@ -191,8 +192,7 @@ def sortClips(request):
data = json.loads(request.POST['data']) data = json.loads(request.POST['data'])
edit = get_edit_or_404_json(data['edit']) edit = get_edit_or_404_json(data['edit'])
response = json_response() response = json_response()
clips = edit.get_clips() clips = _order_clips(edit, data['sort'])
clips = _order_clips(clips, data['sort'])
response['data']['clips'] = [ox.toAZ(c['id']) for c in clips.values('id')] response['data']['clips'] = [ox.toAZ(c['id']) for c in clips.values('id')]
return render_to_json_response(response) return render_to_json_response(response)
actions.register(sortClips, cache=False) actions.register(sortClips, cache=False)