Validate interval and window fields in form

core/forms.py

@@ -4,7 +4,7 @@ from django.core.exceptions import FieldDoesNotExist
 from django.forms import ModelForm
 
 from core.db import QueryError
-from core.lib.rules import NotificationRuleData
+from core.lib.rules import NotificationRuleData, RuleParseError
 
 from .models import NotificationRule, NotificationSettings, User
 
@@ -106,11 +106,10 @@ class NotificationRuleForm(RestrictedFormMixin, ModelForm):
 
     def clean(self):
         cleaned_data = super(NotificationRuleForm, self).clean()
-        data = cleaned_data.get("data")
         try:
-            parsed_data = NotificationRuleData(self.request.user, data)
-        except ValueError as e:
-            self.add_error("data", f"Parsing error: {e}")
+            parsed_data = NotificationRuleData(self.request.user, cleaned_data)
+        except RuleParseError as e:
+            self.add_error(e.field, f"Parsing error: {e}")
             return
         except QueryError as e:
             self.add_error("data", f"Query error: {e}")