diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-09 11:02:14 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-09 11:02:14 +0100 |
commit | 748a112b3bd4cacb2c18e128525196aab977a0c9 (patch) | |
tree | 1708f4ed7251f9e3cb122d50c173815ced7110ff /ishtar_common/models.py | |
parent | 1488f1cbb29d9605e14621982e1450e5801a8fa2 (diff) | |
parent | f40a1a35ec2d87064c3556c81ea7e82de9da1fbd (diff) | |
download | Ishtar-748a112b3bd4cacb2c18e128525196aab977a0c9.tar.bz2 Ishtar-748a112b3bd4cacb2c18e128525196aab977a0c9.zip |
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'ishtar_common/models.py')
-rw-r--r-- | ishtar_common/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 4db445c41..aab532cfc 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -335,7 +335,7 @@ class OwnPerms(object): return returned if query: q = cls.objects.filter(query) - if replace_query: + else: # replace_query q = cls.objects.filter(replace_query) if values: q = q.values(*values) |