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 /archaeological_operations/models.py | |
| parent | e6bb9e38c322defb36c982360864314e90311fa0 (diff) | |
| parent | ad025923f56485175e368e5073eaaba2889d3804 (diff) | |
| download | Ishtar-87cd2c686a6c98484d2b84b1d55278a2848d7787.tar.bz2 Ishtar-87cd2c686a6c98484d2b84b1d55278a2848d7787.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 30cd61010..7c9efaef7 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -551,9 +551,9 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, @classmethod def get_query_owns(cls, user): - return Q(in_charge=user.ishtaruser.person) |\ + return (Q(in_charge=user.ishtaruser.person) |\ Q(scientist=user.ishtaruser.person) |\ - Q(history_creator=user) & Q(end_date__isnull=True) + Q(history_creator=user)) & Q(end_date__isnull=True) def is_active(self): return not bool(self.end_date) |