diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-09 11:01:14 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-09 11:01:14 +0100 |
| commit | f40a1a35ec2d87064c3556c81ea7e82de9da1fbd (patch) | |
| tree | dd9df834f2b502ee883a6881ffdfd470205a6a24 /ishtar_common | |
| parent | 7c0b2e7f72308ea543b9fb15e4d25b7d9b4eddb7 (diff) | |
| parent | cb758fec27e6805f16aec54520d2cac461fffccc (diff) | |
| download | Ishtar-f40a1a35ec2d87064c3556c81ea7e82de9da1fbd.tar.bz2 Ishtar-f40a1a35ec2d87064c3556c81ea7e82de9da1fbd.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ishtar_common')
| -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) |