From 10054ca7a04c7269a20132cdcea8f6b05fe19d87 Mon Sep 17 00:00:00 2001
From: Felix Blanke <info@fblanke.de>
Date: Mon, 3 Mar 2025 00:57:47 +0100
Subject: [PATCH] Improve form errors
---
AKModel/forms.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/AKModel/forms.py b/AKModel/forms.py
index 4f0e399..415d97c 100644
--- a/AKModel/forms.py
+++ b/AKModel/forms.py
@@ -302,9 +302,13 @@ class JSONScheduleImportForm(AdminIntermediateForm):
def clean(self):
cleaned_data = super().clean()
if cleaned_data.get("json_file") and cleaned_data.get("json_data"):
- raise ValidationError("Please enter data as a file OR via text, not both.")
- if not (cleaned_data.get("json_file") or cleaned_data.get("json_data")):
- raise ValidationError("No data entered.")
+ err = ValidationError(_("Please enter data as a file OR via text, not both."), "invalid")
+ self.add_error("json_data", err)
+ self.add_error("json_file", err)
+ elif not (cleaned_data.get("json_file") or cleaned_data.get("json_data")):
+ err = ValidationError(_("No data entered. Please enter data as a file or via text."), "invalid")
+ self.add_error("json_data", err)
+ self.add_error("json_file", err)
# TODO Check input data if it is a valid JSON
--
GitLab