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 | 148b132a03bcc8031b1edfac5810b6aeb890fa8b (patch) | |
| tree | dd9df834f2b502ee883a6881ffdfd470205a6a24 /ishtar_common | |
| parent | 050e801e1096682b5e4efe1a990109eda582dce5 (diff) | |
| parent | 62f73b8142e180eafc698f5e3196514b9ff61f0b (diff) | |
| download | Ishtar-148b132a03bcc8031b1edfac5810b6aeb890fa8b.tar.bz2 Ishtar-148b132a03bcc8031b1edfac5810b6aeb890fa8b.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) |