0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

empty condition

Browse source
This commit is contained in:
j 2011-01-14 14:45:01 +00:00
parent b73c86e5bf
commit 2d117b14db
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/item/managers.py
View file

@ -180,7 +180,7 @@ def parseConditions(conditions, operator):
else: else:
q = q & c q = q & c
return q return q
return None return Q()
class ItemManager(Manager): class ItemManager(Manager):
@ -206,7 +206,6 @@ class ItemManager(Manager):
data = lqs[0].query data = lqs[0].query
conditions = parseConditions(data['query']['conditions'], conditions = parseConditions(data['query']['conditions'],
data['query'].get('operator', '&')) data['query'].get('operator', '&'))
if conditions:
qs = qs.filter(conditions) qs = qs.filter(conditions)
else: else:
qs = qs.filter(id__in=lqs[0].items.all()) qs = qs.filter(id__in=lqs[0].items.all())
@ -240,7 +239,6 @@ class ItemManager(Manager):
qs = qs.filter(available=True) qs = qs.filter(available=True)
conditions = parseConditions(data['query'].get('conditions', []), conditions = parseConditions(data['query'].get('conditions', []),
data['query'].get('operator', '&')) data['query'].get('operator', '&'))
if conditions:
qs = qs.filter(conditions) qs = qs.filter(conditions)
#FIXME: lists are part of query now #FIXME: lists are part of query now