Add handling for non int components keys

python/nav/web/maintenance/utils.py

@@ -98,6 +98,7 @@ def infodict_by_state(task):
 
 def get_component_keys(post):
     remove = {}
+    errors = []
     raw_component_keys = {
         'service': post.getlist('service'),
         'netbox': post.getlist('netbox'),
@@ -125,10 +126,13 @@ def get_component_keys(post):
         for value in raw_component_keys[key]:
             if not remove or value not in remove[key]:
                 if key in PRIMARY_KEY_INTEGER:
+                    if not value.isdigit():
+                        errors.append(key + ": argument needs to be a number")
+                        continue
                     value = int(value)
                 if value not in component_keys[key]:
                     component_keys[key].append(value)
-    return component_keys
+    return component_keys, errors
 
 
 def components_for_keys(component_keys):

python/nav/web/maintenance/views.py

@@ -261,11 +261,8 @@ def edit(request, task_id=None, start_time=None, **_):
     task_form = MaintenanceTaskForm(initial=task_form_initial(task, start_time))
 
     if request.method == 'POST':
-        try:
-            component_keys = get_component_keys(request.POST)
-        except ValueError:
-            component_keys = None
-            component_data = dict()
+        component_keys, component_keys_errors = get_component_keys(request.POST)
+
     elif task:
         component_keys = {
             'service': [],
@@ -279,19 +276,22 @@ def edit(request, task_id=None, start_time=None, **_):
                 value = int(value)
             component_keys[key].append(value)
     else:
-        component_keys = get_component_keys(request.GET)
+        component_keys, component_keys_errors = get_component_keys(request.GET)
 
     if component_keys:
         component_data = components_for_keys(component_keys)
         components = structure_component_data(component_data)
         component_trail = task_component_trails(component_keys, components)
 
+    if component_keys_errors:
+        new_message(request, ",".join(component_keys_errors), Messages.ERROR)
+
     if request.method == 'POST':
         if 'save' in request.POST:
             task_form = MaintenanceTaskForm(request.POST)
-            if not any(component_data.values()):
+            if component_keys and not any(component_data.values()):
                 new_message(request, "No components selected.", Messages.ERROR)
-            elif task_form.is_valid():
+            elif not component_keys_errors and task_form.is_valid():
                 start_time = task_form.cleaned_data['start_time']
                 end_time = task_form.cleaned_data['end_time']
                 no_end_time = task_form.cleaned_data['no_end_time']

tests/integration/web/maintenance/views_test.py

@@ -87,11 +87,19 @@ def test_with_non_int_netbox_key_should_fail(self, db, client):
         )
 
         assert response.status_code == 200
-        assert "No components selected." in smart_str(response.content)
+        assert "netbox: argument needs to be a number" in smart_str(response.content)
         assert not MaintenanceTask.objects.filter(
             description=data["description"]
         ).exists()
 
+    def test_with_non_int_netbox_key_in_url_should_fail(self, db, client):
+        url = reverse('maintenance-new') + '?netbox=foobar'
+
+        response = client.get(url, follow=True)
+
+        assert response.status_code == 200
+        assert "netbox: argument needs to be a number" in smart_str(response.content)
+
     def test_with_end_time_before_start_time_should_fail(self, db, client, localhost):
         url = reverse('maintenance-new')
         data = {