diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 16:31:20 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 16:31:20 +0100 |
commit | e1d1617579a8600cd9a31a09f05931620d03d982 (patch) | |
tree | 1f43810da46aa16e70802516eed1ea39265be481 /archaeological_warehouse/forms.py | |
parent | 3bb433a29e2bb1d68c5b5a8227fd731aa5555bd1 (diff) | |
download | Ishtar-e1d1617579a8600cd9a31a09f05931620d03d982.tar.bz2 Ishtar-e1d1617579a8600cd9a31a09f05931620d03d982.zip |
Container form: fix message when no warehouse is set
Diffstat (limited to 'archaeological_warehouse/forms.py')
-rw-r--r-- | archaeological_warehouse/forms.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index 65c11b086..e880e2547 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -201,7 +201,7 @@ class ContainerForm(ManageOldType, forms.Form): class ContainerModifyForm(ContainerForm): pk = forms.IntegerField(required=False, widget=forms.HiddenInput) - index = forms.IntegerField(_(u"Index")) + index = forms.IntegerField(label=_(u"ID")) def __init__(self, *args, **kwargs): super(ContainerModifyForm, self).__init__(*args, **kwargs) @@ -273,20 +273,20 @@ class LocalisationForm(forms.Form): form_label = _(u"Localisation") def __init__(self, *args, **kwargs): - container, warehouse = None, None + self.container, self.warehouse = None, None if 'warehouse' in kwargs: - warehouse = kwargs.pop('warehouse') + self.warehouse = kwargs.pop('warehouse') if 'container' in kwargs: - container = kwargs.pop('container') + self.container = kwargs.pop('container') super(LocalisationForm, self).__init__(*args, **kwargs) - if not warehouse: + if not self.warehouse: return - for divlink in warehouse.warehousedivisionlink_set.order_by( + for divlink in self.warehouse.warehousedivisionlink_set.order_by( 'order').all(): initial = u"-" - if container: + if self.container: q = models.ContainerLocalisation.objects.filter( - division=divlink, container=container) + division=divlink, container=self.container) if q.count(): initial = q.all()[0].reference self.fields['division_{}'.format(divlink.pk)] = forms.CharField( |