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

Treat findEdits({}) like findEdits({query: {}}) (fixes #2820)

Browse source
This commit is contained in:
Will Thompson 2015-07-22 21:37:55 +02:00 committed by j
parent 4c0652e683
commit ab5a20d3a2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pandora/edit/managers.py
View file

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

3
pandora/edit/views.py
View file

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