diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-30 14:06:26 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-30 14:06:26 +0100 |
commit | 054e010611b2bc3d0eca17ef46f3f3885c00f6fc (patch) | |
tree | c95a62c8fec2b2814428a164c4026acc1d22cabc /archaeological_operations/models.py | |
parent | a34420fe467f8152017e33629ef6604966072529 (diff) | |
parent | 08da2171c978689701492c60848b865dcd0df04f (diff) | |
download | Ishtar-054e010611b2bc3d0eca17ef46f3f3885c00f6fc.tar.bz2 Ishtar-054e010611b2bc3d0eca17ef46f3f3885c00f6fc.zip |
Merge branch 'v0.9' into wheezy
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) |