summaryrefslogtreecommitdiff
path: root/ishtar_common/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-30 13:56:52 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-30 13:56:52 +0100
commitf8b229b5cfb21293e372d0f3abc9e075a48ee172 (patch)
tree429269e02dbfe6cb9580f935eabb777024217004 /ishtar_common/views.py
parentb19c153ec23bec6ddc506c5269254b8da13db706 (diff)
downloadIshtar-f8b229b5cfb21293e372d0f3abc9e075a48ee172.tar.bz2
Ishtar-f8b229b5cfb21293e372d0f3abc9e075a48ee172.zip
Fix material_types search for finds - add tests for hierarchical searches
Diffstat (limited to 'ishtar_common/views.py')
-rw-r--r--ishtar_common/views.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index dbbc3d538..b7ef5ea47 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -759,7 +759,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
if not idx:
q = Q(**{r: val})
else:
- q = q | Q(**{r: val})
+ q |= Q(**{r: val})
and_reqs.append(q)
break
elif req.endswith(k_hr + '__pk'):
@@ -769,7 +769,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
for idx in xrange(HIERARCHIC_LEVELS):
req = req[:-2] + 'parent__pk'
q = Q(**{req: val})
- reqs = reqs | q
+ reqs |= q
and_reqs.append(reqs)
break
query = Q(**dct)