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

always include empty annotations

Browse source
This commit is contained in:
j 2014-11-21 16:24:49 +00:00
parent 3aadc0f513
commit b8b91592b5
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pandora/clip/views.py
View file

@ -124,12 +124,13 @@ def findClips(request, data):
values.append('layer') values.append('layer')
if query['filter']: if query['filter']:
qs = qs.filter(query['filter']) qs = qs.filter(query['filter'])
for i in response['data']['items']:
if not key in i:
i[key] = []
for a in qs.values(*values): for a in qs.values(*values):
public_id = clip_public_id(a) public_id = clip_public_id(a)
for i in response['data']['items']: for i in response['data']['items']:
if i['id'] == public_id: if i['id'] == public_id:
if not key in i:
i[key] = []
l = { l = {
'id': a['public_id'], 'id': a['public_id'],
'value': a['value'], 'value': a['value'],
@ -143,7 +144,7 @@ def findClips(request, data):
if 'annotations' in keys: if 'annotations' in keys:
aqs = Annotation.objects.filter(layer__in=settings.CONFIG['clipLayers'], aqs = Annotation.objects.filter(layer__in=settings.CONFIG['clipLayers'],
clip__in=ids) clip__in=ids)
add_annotations('annotations',aqs , True) add_annotations('annotations', aqs , True)
layer_ids = [k['id'] for k in settings.CONFIG['layers']] layer_ids = [k['id'] for k in settings.CONFIG['layers']]
for layer in filter(lambda l: l in keys, layer_ids): for layer in filter(lambda l: l in keys, layer_ids):
aqs = Annotation.objects.filter(layer=layer, clip__in=ids) aqs = Annotation.objects.filter(layer=layer, clip__in=ids)