diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-30 14:03:58 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-30 14:03:58 +0100 |
| commit | 87cd2c686a6c98484d2b84b1d55278a2848d7787 (patch) | |
| tree | 9748b68fd6937bd773fd5cc9b00da492d986155b /ishtar_common/views.py | |
| parent | e6bb9e38c322defb36c982360864314e90311fa0 (diff) | |
| parent | ad025923f56485175e368e5073eaaba2889d3804 (diff) | |
| download | Ishtar-87cd2c686a6c98484d2b84b1d55278a2848d7787.tar.bz2 Ishtar-87cd2c686a6c98484d2b84b1d55278a2848d7787.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 4 |
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) |