diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-19 18:40:32 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-19 18:41:04 +0200 |
commit | 80636d8cd2079d43bc69ff041409196798a0cf9b (patch) | |
tree | 86973a6761dfda4b6ccabcc0a5b084e291af6c60 /archaeological_warehouse/models.py | |
parent | c6522eb812cd6caf6a8d9b776f9941dff8b6252d (diff) | |
download | Ishtar-80636d8cd2079d43bc69ff041409196798a0cf9b.tar.bz2 Ishtar-80636d8cd2079d43bc69ff041409196798a0cf9b.zip |
Django 1.8: simplify ihtaruser management
Diffstat (limited to 'archaeological_warehouse/models.py')
-rw-r--r-- | archaeological_warehouse/models.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 96814339c..c8f50987e 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -81,8 +81,8 @@ class Warehouse(Address, DashboardFormItem, OwnPerms): slugify(unicode(self)) @classmethod - def get_query_owns(cls, user): - return Q(person_in_charge__ishtaruser=user.ishtaruser) + def get_query_owns(cls, ishtaruser): + return Q(person_in_charge__ishtaruser=ishtaruser) @property def number_of_finds(self): @@ -310,10 +310,10 @@ class Container(LightHistorizedItem, ImageModel): return cached_label @classmethod - def get_query_owns(cls, user): - return Q(history_creator=user) | \ - Q(location__person_in_charge__ishtaruser=user.ishtaruser) | \ - Q(responsible__person_in_charge__ishtaruser=user.ishtaruser) + def get_query_owns(cls, ishtaruser): + return Q(history_creator=ishtaruser.user_ptr) | \ + Q(location__person_in_charge__ishtaruser=ishtaruser) | \ + Q(responsible__person_in_charge__ishtaruser=ishtaruser) @property def associated_filename(self): |