Merge remote-tracking branch 'inventree/master'

This commit is contained in:
Oliver Walters 2020-11-13 10:01:33 +11:00
commit f289e9cf35

View File

@ -29,11 +29,6 @@ class HelperForm(forms.ModelForm):
self.helper.form_tag = False self.helper.form_tag = False
# Check for errors from model validation
# If none, disable crispy form errors
if not self.errors:
self.helper.form_show_errors = False
""" """
Create a default 'layout' for this form. Create a default 'layout' for this form.
Ref: https://django-crispy-forms.readthedocs.io/en/latest/layouts.html Ref: https://django-crispy-forms.readthedocs.io/en/latest/layouts.html
@ -44,6 +39,17 @@ class HelperForm(forms.ModelForm):
self.rebuild_layout() self.rebuild_layout()
def is_valid(self):
valid = super(HelperForm, self).is_valid()
# Check for errors from model validation
# If none, disable crispy form errors
if not self.errors:
self.helper.form_show_errors = False
return valid
def rebuild_layout(self): def rebuild_layout(self):
layouts = [] layouts = []