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

Allow 'query' to be omitted from find*() (fixes #2883)

Browse source 
I hit this in findDocuments() so thought I'd fix them all.
This commit is contained in:
Will Thompson 2016-02-15 14:21:36 +00:00
commit 47d8d67c3d
7 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pandora/itemlist/managers.py
View file

@ -120,8 +120,9 @@ class ListManager(Manager):
#join query with operator
qs = self.get_query_set()
conditions = parseConditions(data['query'].get('conditions', []),
data['query'].get('operator', '&'),
query = data.get('query', {})
conditions = parseConditions(query.get('conditions', []),
query.get('operator', '&'),
user)
if conditions:
qs = qs.filter(conditions)

5
pandora/itemlist/views.py
View file

@ -80,7 +80,10 @@ def findLists(request, data):
return x['key'] == 'status' and \
x['value'] == 'featured' and \
x['operator'] in ('=', '==')
is_featured = len(filter(is_featured_condition, data['query'].get('conditions', []))) > 0
is_featured = any(
is_featured_condition(x)
for x in data.get('query', {}).get('conditions', [])
)
if is_section_request:
qs = query['qs']