Merge branch 'master' into spacing-between-cols-in-incident-details

Uninett · Jan 24, 2025 · ffba88c · ffba88c
2 parents 9bc4ec7 + 7564dae
commit ffba88c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
         exclude: &exclude_pattern '^changelog.d/'
     -   id: debug-statements
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.2
+    rev: v0.9.3
     hooks:
         # Run the linter
     -   id: ruff

diff --git a/changelog.d/1147.fixed.md b/changelog.d/1147.fixed.md
@@ -0,0 +1 @@
+Show relevant error message on destination delete by passing the original exception message to the UI.
diff --git a/src/argus/htmx/destination/views.py b/src/argus/htmx/destination/views.py
@@ -34,8 +34,8 @@ def delete_htmx(request, pk: int) -> HttpResponse:
     try:
         medium = api_safely_get_medium_object(destination.media.slug)
         medium.raise_if_not_deletable(destination)
-    except NotificationMedium.NotDeletableError:
-        error_msg = "That destination cannot be deleted."
+    except NotificationMedium.NotDeletableError as e:
+        error_msg = " ".join(e.args)
     else:
         destination.delete()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Show relevant error message on destination delete by passing the original exception message to the UI.