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

fix view with clips

Browse source
This commit is contained in:
j 2012-01-19 00:33:29 +05:30
commit b4cc3621ff
4 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pandora/item/models.py
View file

@ -567,12 +567,14 @@ class Item(models.Model):
elif i == 'filename':
save(i,
'\n'.join([f.path for f in self.files.all()]))
elif key['id'] == 'annotations':
qs = Annotation.objects.filter(item=self)
qs = qs.filter(layer__in=Annotation.public_layers())
qs = qs.order_by('start')
save(i, u'\n'.join([l.findvalue for l in qs]))
elif key['type'] == 'layer':
qs = Annotation.objects.filter(item=self)
if i == 'annotations':
qs = qs.filter(layer__in=Annotation.public_layers())
else:
qs = qs.filter(layer=i)
qs = qs.filter(layer=i)
qs = qs.order_by('start')
save(i, u'\n'.join([l.findvalue for l in qs]))
elif i != '*' and i not in self.facet_keys:

9
pandora/item/views.py
View file

@ -91,12 +91,11 @@ def parse_query(data, user):
if key in data:
query[key] = data[key]
query['qs'] = models.Item.objects.find(data, user)
if 'clips' in data:
query['clip_qs'] = Clip.objects.find({'query': data['clips']['query']},
user).order_by('start')
query['clip_filter'] = Clip.objects.find({'query': data['clips']['query']},
user)
conditions = {'query': data['clips']['query']}
query['clip_qs'] = Clip.objects.find(conditions, user).order_by('start')
conditions = {'query': data['query']}
query['clip_filter'] = models.Clip.objects.filter_annotations(conditions, user)
query['clip_items'] = data['clips'].get('items', 5)
query['clip_keys'] = data['clips'].get('keys')
if not query['clip_keys']: