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

itemsQuery/clipsQuery

Browse source
This commit is contained in:
j 2011-10-19 16:20:12 +00:00
commit 80ade383f9
11 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pandora/annotation/views.py
View file

@ -27,8 +27,8 @@ def parse_query(data, user):
if key in data:
query[key] = data[key]
query['qs'] = models.Annotation.objects.find(query, user)
if 'itemQuery' in data:
item_query = Item.objects.find({'query': data['itemQuery']}, user)
if 'itemsQuery' in data:
item_query = Item.objects.find({'query': data['itemsQuery']}, user)
query['qs'] = query['qs'].filter(item__in=item_query)
return query
@ -68,7 +68,7 @@ def findAnnotations(request):
'''
param data {
query: ...
itemQuery: ...
itemsQuery: ...
}
return {