From 56f05e260455df01050a9175ea1fe9eae855081f Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Fri, 27 Nov 2020 10:42:01 +1100
Subject: [PATCH] Fixes for 'non field' errors in forms
- Fixes issue where non-model fields would not show error text
---
InvenTree/InvenTree/forms.py | 6 +-----
InvenTree/templates/modal_form.html | 16 +++-------------
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/InvenTree/InvenTree/forms.py b/InvenTree/InvenTree/forms.py
index 4be8a28acb..56a1a116da 100644
--- a/InvenTree/InvenTree/forms.py
+++ b/InvenTree/InvenTree/forms.py
@@ -28,6 +28,7 @@ class HelperForm(forms.ModelForm):
self.helper = FormHelper()
self.helper.form_tag = False
+ self.helper.form_show_errors = True
"""
Create a default 'layout' for this form.
@@ -43,11 +44,6 @@ class HelperForm(forms.ModelForm):
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):
diff --git a/InvenTree/templates/modal_form.html b/InvenTree/templates/modal_form.html
index 0a5ae59916..94bf032579 100644
--- a/InvenTree/templates/modal_form.html
+++ b/InvenTree/templates/modal_form.html
@@ -1,3 +1,5 @@
+{% load i18n %}
+
<div>
{% if form.pre_form_info %}
<div class='alert alert-info alert-block' role='alert'>
@@ -9,18 +11,6 @@
{{ form.pre_form_warning }}
</div>
{% endif %}
-{% block non_field_error %}
-{% if form.non_field_errors %}
-<div class='alert alert-danger alert-block' role='alert'>
- <b>Error Submitting Form:</b>
- <ul>
- {% for error in form.non_field_errors %}
- {{ error }}
- {% endfor %}
- </ul>
-</div>
-{% endif %}
-{% endblock %}
</div>
{% block pre_form_content %}
@@ -41,4 +31,4 @@
{% endblock %}
{% block post_form_content %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}