diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-01-28 11:08:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-01-28 11:08:28 +0100 |
| commit | 198a1035f785204d41eda8fc07c5441456930885 (patch) | |
| tree | e5b95d145784123773d2253ba104d43de68d9148 /archaeological_warehouse | |
| parent | ca4f77317652c6bce113514e5dc069ba84311e6f (diff) | |
| download | Ishtar-198a1035f785204d41eda8fc07c5441456930885.tar.bz2 Ishtar-198a1035f785204d41eda8fc07c5441456930885.zip | |
Warehouse forms: fix error on division fields
Do not display error on empty fields.
Check that order are differents.
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/forms.py | 7 |
1 files changed, 4 insertions, 3 deletions
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( |