Add throwable message to JSON error responses

getformwork · Mar 1, 2025 · 4f90fb9 · 4f90fb9
1 parent 2ce9012
commit 4f90fb9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/formwork/src/Controllers/ErrorsController.php b/formwork/src/Controllers/ErrorsController.php
@@ -23,7 +23,11 @@ public function error(ResponseStatus $responseStatus = ResponseStatus::InternalS
         }
 
         if ($this->request->isXmlHttpRequest()) {
-            $response = JsonResponse::error('Error', $responseStatus);
+            $message = $responseStatus->message();
+            if (isset($data['throwable'])) {
+                $message .= ': ' . $data['throwable']->getMessage();
+            }
+            $response = JsonResponse::error($message, $responseStatus);
         } else {
             $response = new Response($this->view(
                 'errors.error',

diff --git a/formwork/src/Panel/Controllers/ErrorsController.php b/formwork/src/Panel/Controllers/ErrorsController.php
@@ -69,7 +69,11 @@ private function makeErrorResponse(ResponseStatus $responseStatus, string $name,
         }
 
         if ($this->request->isXmlHttpRequest()) {
-            $response = JsonResponse::error('Error', $responseStatus);
+            $message = $this->translate('panel.errors.error.' . $name . '.status');
+            if (isset($data['throwable'])) {
+                $message .= ': ' . $data['throwable']->getMessage();
+            }
+            $response = JsonResponse::error($message, $responseStatus);
         } else {
             $response = new Response($this->view('errors.error', [
                 'title'       => $this->translate('panel.errors.error.' . $name . '.status'),