fixup! Handle form errors in status navlet

Author: Simrayz

python/nav/web/navlets/__init__.py

@@ -160,7 +160,7 @@ def post(self, request, *_, **kwargs):
 
         Make sure you're not overriding stuff with the form
         """
-        form = kwargs.get('form')
+        form = kwargs.pop('form')
         if not form:
             return HttpResponse('No form supplied', status=400)
 
@@ -169,17 +169,13 @@ def post(self, request, *_, **kwargs):
             self.account_navlet.save()
             return self.get(request=request)
         else:
-            return self.handle_error_response(request, form, **kwargs)
+            return self.handle_error_response(request, form=form, **kwargs)
 
     def handle_error_response(self, request, form, **kwargs):
         """Render error response for invalid form submissions"""
-        errors = []
-        for field, field_errors in form.errors.items():
-            for error in field_errors:
-                errors.append(str(error))
-
-        context = self.get_context_data(override_mode=NAVLET_MODE_EDIT, **kwargs)
-        context['errors'] = errors
+        context = self.get_context_data(
+            override_mode=NAVLET_MODE_EDIT, form=form, **kwargs
+        )
         return render(
             request, self.get_template_names(override_mode=NAVLET_MODE_EDIT), context
         )

python/nav/web/status2/forms.py

@@ -192,6 +192,13 @@ class StatusWidgetForm(StatusPanelForm):
         ),
     )
 
+    interval = forms.IntegerField(
+        required=True,
+        min_value=1,
+        label='Refresh interval (seconds)',
+        widget=forms.NumberInput(attrs={'min': 1, 'step': 1}),
+    )
+
     def __init__(self, *args, **kwargs):
         super(StatusWidgetForm, self).__init__(*args, **kwargs)
 
@@ -217,6 +224,7 @@ def __init__(self, *args, **kwargs):
 
         self.attrs = set_flat_form_attributes(
             form_fields=[
+                FormRow(fields=[FormColumn(fields=[self["interval"]])]),
                 FormRow(
                     fields=[
                         FormColumn(

python/nav/web/templates/navlets/status2_edit.html

@@ -9,10 +9,6 @@
     hx-swap="innerHTML"
     hx-preserve="true"
   >
-    <label>
-      Refresh interval (seconds)
-      <input type="text" name="interval" value="{{ interval }}">
-    </label>
     {% include 'custom_crispy_templates/_form_content.html' %}
   </form>