From f1ae9d46287bdc6eeda3e7c2da6efcbacf422ef9 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 7 Mar 2022 19:21:56 +0100 Subject: Operation - Parcels - Modify: do not check for identical on deleted forms --- ishtar_common/forms.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ishtar_common/forms.py') diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index 20658d2de..020d54198 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -512,7 +512,8 @@ class FormSet(CustomForm, BaseFormSet): ] super(FormSet, self).__init__(*args, **kwargs) - def check_duplicate(self, key_names, error_msg="", check_null=False): + def check_duplicate(self, key_names, error_msg="", check_null=False, + exclude_deleted=False): """Check for duplicate items in the formset""" if any(self.errors): return @@ -523,6 +524,8 @@ class FormSet(CustomForm, BaseFormSet): form = self.forms[i] if not form.is_valid(): continue + if exclude_deleted and form.cleaned_data.get("DELETE", False): + continue item = [ key_name in form.cleaned_data and form.cleaned_data[key_name] for key_name in key_names -- cgit v1.2.3