diff --git a/formwork/src/Controllers/ErrorsController.php b/formwork/src/Controllers/ErrorsController.php index 97cdeac6..9e770681 100644 --- 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 index 0e21bf66..032bb126 100644 --- 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'),