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

fix per item document description

Browse source
This commit is contained in:
j 2014-01-08 04:32:57 +00:00
commit d1014334be
5 changed files with 159 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pandora/document/managers.py
View file

@ -4,7 +4,7 @@ from django.db.models import Q, Manager
from ox.django.query import QuerySet
def parseCondition(condition, user):
def parseCondition(condition, user, item=None):
'''
'''
k = condition.get('key', 'name')
@ -14,6 +14,11 @@ def parseCondition(condition, user):
}.get(k, k)
if not k:
k = 'name'
if item and k == 'description':
item_conditions = condition.copy()
item_conditions['key'] = 'items__itemproperties__description'
return parseCondition(condition, user) | parseCondition(item_condition, user)
v = condition['value']
op = condition.get('operator')
if not op:
@ -50,7 +55,7 @@ def parseCondition(condition, user):
q = Q(**{key: v})
return q
def parseConditions(conditions, operator, user):
def parseConditions(conditions, operator, user, item=None):
'''
conditions: [
{
@ -73,12 +78,12 @@ def parseConditions(conditions, operator, user):
for condition in conditions:
if 'conditions' in condition:
q = parseConditions(condition['conditions'],
condition.get('operator', '&'), user)
condition.get('operator', '&'), user, item)
if q:
conn.append(q)
pass
else:
conn.append(parseCondition(condition, user))
conn.append(parseCondition(condition, user, item))
if conn:
q = conn[0]
for c in conn[1:]:
@ -95,7 +100,7 @@ class DocumentManager(Manager):
def get_query_set(self):
return QuerySet(self.model)
def find(self, data, user):
def find(self, data, user, item=None):
'''
query: {
conditions: [
@ -121,7 +126,7 @@ class DocumentManager(Manager):
qs = self.get_query_set()
conditions = parseConditions(data['query'].get('conditions', []),
data['query'].get('operator', '&'),
user)
user, item)
if conditions:
qs = qs.filter(conditions)