change looks of error_msg

Uninett · Jan 27, 2025 · 6b68b12 · 6b68b12
1 parent 2fc059e
commit 6b68b12
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/argus/htmx/middleware.py b/src/argus/htmx/middleware.py
@@ -97,12 +97,12 @@ def process_response(self, request: HtmxHttpRequest, response: HttpResponse) ->
             has_error_message = any("error" in message.tags for message in storage)
             storage.used = False
             if not has_error_message:
-                error_msg = str(getattr(response, "content", b""))
+                error_msg = getattr(response, "content", b"")
+                if isinstance(error_msg, bytes):
+                    error_msg = error_msg.decode("utf-8")
                 if not error_msg:
                     error_msg = f"{response.status_code} {response.reason_phrase}"
-                messages.error(
-                    request, f"An error occured while processing your request, please try again: {error_msg}"
-                )
+                messages.error(request, f"An unexpected error occured: {error_msg}. Please try again")
                 LOG.error("Unhandled exception: %s", error_msg)
             # HTMX doesn't swap content for response codes >=400. However, we do want to show
             # the new messages, so we need to rewrite the response to 200, and make sure it only