diff --git a/pandora/annotation/managers.py b/pandora/annotation/managers.py index 872bc9b1a..1949115d4 100644 --- a/pandora/annotation/managers.py +++ b/pandora/annotation/managers.py @@ -96,9 +96,7 @@ def parseConditions(conditions, operator, user): conn.append(q) pass else: - if condition.get('value', '') != '' or \ - condition.get('operator', '') == '=': - conn.append(parseCondition(condition, user)) + conn.append(parseCondition(condition, user)) if conn: q = conn[0] for c in conn[1:]: diff --git a/pandora/event/managers.py b/pandora/event/managers.py index 1bf7c218a..e0d83afbf 100644 --- a/pandora/event/managers.py +++ b/pandora/event/managers.py @@ -46,9 +46,7 @@ def parseConditions(conditions, operator, user): conn.append(q) pass else: - if condition.get('value', '') != '' or \ - condition.get('operator', '') == '=': - conn.append(parseCondition(condition, user)) + conn.append(parseCondition(condition, user)) if conn: q = conn[0] for c in conn[1:]: diff --git a/pandora/item/managers.py b/pandora/item/managers.py index bfc8cb406..fd2fcaf7c 100644 --- a/pandora/item/managers.py +++ b/pandora/item/managers.py @@ -166,9 +166,7 @@ def parseConditions(conditions, operator): conn.append(q) pass else: - if condition.get('value', '') != '' or \ - condition.get('operator', '') == '=': - conn.append(parseCondition(condition)) + conn.append(parseCondition(condition)) if conn: q = conn[0] for c in conn[1:]: diff --git a/pandora/itemlist/managers.py b/pandora/itemlist/managers.py index 44bbfbd11..6eb6f4a18 100644 --- a/pandora/itemlist/managers.py +++ b/pandora/itemlist/managers.py @@ -10,6 +10,7 @@ import models def parseCondition(condition, user): ''' ''' + print condition, user k = condition.get('key', 'name') k = { 'user': 'user__username', @@ -20,7 +21,7 @@ def parseCondition(condition, user): v = condition['value'] op = condition.get('operator') if not op: - op = '' + op = '=' if op.startswith('!'): op = op[1:] exclude = True @@ -45,7 +46,6 @@ def parseCondition(condition, user): '^': '__istartswith', '$': '__iendswith', }.get(op, '__icontains')) - key = str(key) if exclude: q = ~Q(**{key: v}) @@ -81,9 +81,7 @@ def parseConditions(conditions, operator, user): conn.append(q) pass else: - if condition.get('value', '') != '' or \ - condition.get('operator', '') == '=': - conn.append(parseCondition(condition, user)) + conn.append(parseCondition(condition, user)) if conn: q = conn[0] for c in conn[1:]: diff --git a/pandora/itemlist/views.py b/pandora/itemlist/views.py index f039c0fb4..563600f70 100644 --- a/pandora/itemlist/views.py +++ b/pandora/itemlist/views.py @@ -96,7 +96,6 @@ def findLists(request): else: qs = _order_query(query['qs'], query['sort']) - qs = qs.distinct() response = json_response() if 'keys' in data: qs = qs[query['range'][0]:query['range'][1]] diff --git a/pandora/place/managers.py b/pandora/place/managers.py index eeb0e7f8a..a44defc5d 100644 --- a/pandora/place/managers.py +++ b/pandora/place/managers.py @@ -92,9 +92,7 @@ def parseConditions(conditions, operator, user): conn.append(q) pass else: - if condition.get('value', '') != '' or \ - condition.get('operator', '') == '=': - conn.append(parseCondition(condition, user)) + conn.append(parseCondition(condition, user)) if conn: q = conn[0] for c in conn[1:]: diff --git a/pandora/user/managers.py b/pandora/user/managers.py index 3cb9084c3..72a99d4d1 100644 --- a/pandora/user/managers.py +++ b/pandora/user/managers.py @@ -47,9 +47,7 @@ def parseConditions(conditions, operator, user): conn.append(q) pass else: - if condition.get('value', '') != '' or \ - condition.get('operator', '') == '=': - conn.append(parseCondition(condition, user)) + conn.append(parseCondition(condition, user)) if conn: q = conn[0] for c in conn[1:]: