diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-08 18:13:35 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-08 18:13:35 +0200 |
| commit | f54d386b714f3a1abef103006e36972776d2028e (patch) | |
| tree | 2cba33588e42ec214b3d30b4825e36e7c4e47b40 /archaeological_finds/forms.py | |
| parent | 316dc98ccdee59d6d4709f2a9e253cc258b2037e (diff) | |
| parent | aef35a14f4bd3f3f87c1e19188d57cc66e6694b6 (diff) | |
| download | Ishtar-f54d386b714f3a1abef103006e36972776d2028e.tar.bz2 Ishtar-f54d386b714f3a1abef103006e36972776d2028e.zip | |
Merge branch 'master-warehouse'
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 99907781b..f5387febe 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -432,8 +432,12 @@ class SelectFindBasketForm(forms.Form): basket = forms.ChoiceField(label=_(u"Basket"), required=True, choices=[]) def __init__(self, *args, **kwargs): - self.user = kwargs.pop('user') + self.user = None + if 'user' in kwargs: + self.user = kwargs.pop('user') super(SelectFindBasketForm, self).__init__(*args, **kwargs) + if not self.user: + return self.fields['basket'].choices = [('', '--')] + [ (b.pk, unicode(b)) for b in models.FindBasket.objects.filter(user=self.user)] |