summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-11-08 15:57:44 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-11-08 15:57:44 +0100
commite81ed7c95c3709fa3beb48ffe189607047c36d3a (patch)
treed8c431c7b9872afb9beec32816988abec4d7d10c
parent24dc9b9dbdacc7e249bd752313768cca2b198d91 (diff)
parent2af9622802fe386f5780719db5d2c4cf956d8b20 (diff)
downloadIshtar-e81ed7c95c3709fa3beb48ffe189607047c36d3a.tar.bz2
Ishtar-e81ed7c95c3709fa3beb48ffe189607047c36d3a.zip
Merge branch 'develop' into develop-bootstrap
-rw-r--r--archaeological_finds/forms.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index cc1f6b145..b88ee164e 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -760,7 +760,9 @@ class SelectFindBasketForm(forms.Form):
def __init__(self, *args, **kwargs):
self.user = None
if 'user' in kwargs:
- self.user = kwargs.pop('user').ishtaruser
+ self.user = kwargs.pop('user')
+ if hasattr(self.user, 'ishtaruser'):
+ self.user = self.user.ishtaruser
super(SelectFindBasketForm, self).__init__(*args, **kwargs)
if not self.user: