From ec568def551723862e1e64f92d555746854d48f7 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. --- ishtar_common/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ishtar_common/forms.py') diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index c0dbc6d7f..2a072aade 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -414,7 +414,7 @@ class FormSet(CustomForm, BaseFormSet): kwargs["data"][prefix + '-INITIAL_FORMS'] super(FormSet, self).__init__(*args, **kwargs) - def check_duplicate(self, key_names, error_msg=""): + def check_duplicate(self, key_names, error_msg="", check_null=False): """Check for duplicate items in the formset""" if any(self.errors): return @@ -428,7 +428,7 @@ class FormSet(CustomForm, BaseFormSet): item = [key_name in form.cleaned_data and form.cleaned_data[key_name] for key_name in key_names] - if not [v for v in item if v]: + if not check_null and not [v for v in item if v]: continue if item in items: raise forms.ValidationError(error_msg) -- cgit v1.2.3