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

return item id, exclude empty annotations

Browse source
This commit is contained in:
j 2014-10-26 17:44:36 +00:00
parent e95c9011e7
commit d6513d4570
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/annotation/models.py
View file

@ -237,6 +237,8 @@ class Annotation(models.Model):
if layer or (keys and 'layer' in keys): if layer or (keys and 'layer' in keys):
j['layer'] = self.layer j['layer'] = self.layer
if keys and 'item' in keys:
j['item'] = self.item.public_id
if keys: if keys:
_j = {} _j = {}
for key in keys: for key in keys:

2
pandora/annotation/views.py
View file

@ -58,7 +58,7 @@ def order_query(qs, 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) qs = qs.order_by(*order_by, nulls_last=True).exclude(value='')
return qs return qs
def findAnnotations(request, data): def findAnnotations(request, data):