From 198a1035f785204d41eda8fc07c5441456930885 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 28 Jan 2019 11:08:28 +0100 Subject: Warehouse forms: fix error on division fields Do not display error on empty fields. Check that order are differents. --- archaeological_warehouse/forms.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'archaeological_warehouse/forms.py') diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index 2df03c036..6e03a8669 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -55,7 +55,7 @@ class SelectedDivisionForm(ManageOldType, forms.Form): division = forms.ChoiceField( label=_(u"Division"), choices=(), validators=[valid_id(models.WarehouseDivision)]) - order = forms.IntegerField(_(u"Order"), initial=10, required=False) + order = forms.IntegerField(_(u"Order"), required=False) def __init__(self, *args, **kwargs): super(SelectedDivisionForm, self).__init__(*args, **kwargs) @@ -68,8 +68,9 @@ class SelectedDivisionForm(ManageOldType, forms.Form): class DivisionFormSet(FormSet): def clean(self): """Checks that no divisions are duplicated.""" - return self.check_duplicate(('division',), - _("There are identical divisions.")) + self.check_duplicate(('division',), _("There are identical divisions.")) + self.check_duplicate(('order',), _(u"Order fields must be different."), + check_null=True) SelectedDivisionFormset = formset_factory( -- cgit v1.2.3