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

ignore noop conditions, return descriptions, itemlist/items, update selected frame after uploading frames

Browse source
This commit is contained in:
j 2011-11-06 14:12:15 +01:00
commit e41a23e1d4
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pandora/item/managers.py
View file

@ -45,6 +45,9 @@ def parseCondition(condition, user):
else:
return q
if (not exclude and op == '=' or op in ('$', '^')) and v == '':
return Q(True)
if k == 'filename' and (user.is_anonymous() or \
not user.get_profile().capability('canSeeFiles')):
return Q(id=0)
@ -112,7 +115,7 @@ def parseCondition(condition, user):
q = Q(**{value_key: v})
return q
elif key_type == 'list':
q = Q(itemId=False)
q = Q(id=0)
l = v.split(":")
if len(l) >= 2:
l = (l[0], ":".join(l[1:]))
@ -185,7 +188,6 @@ def parseConditions(conditions, operator, user):
condition.get('operator', '&'), user)
if q:
conn.append(q)
pass
else:
conn.append(parseCondition(condition, user))
if conn: