From 0c905257655e6812548c3390e212d528749f0831 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Thu, 4 Apr 2024 12:17:43 +0800 Subject: [PATCH] Update --- app/Admin/Controllers/AdminController.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Admin/Controllers/AdminController.php b/app/Admin/Controllers/AdminController.php index 88d5011..27ebb3c 100644 --- a/app/Admin/Controllers/AdminController.php +++ b/app/Admin/Controllers/AdminController.php @@ -6,7 +6,9 @@ use App\Traits\CustomActionTrait; use Illuminate\Http\Request; use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; +use Illuminate\Validation\ValidationException; use Slowlyo\OwlAdmin\Controllers\AdminController as Controller; +use Slowlyo\OwlAdmin\Exceptions\AdminException; use Throwable; /** @@ -39,7 +41,7 @@ abstract class AdminController extends Controller DB::commit(); } catch (Throwable $th) { DB::rollBack(); - throw $th; + throw $this->prepareException($th); } return $this->response()->successMessage(__('admin.save') . __('admin.successfully')); @@ -68,7 +70,7 @@ abstract class AdminController extends Controller DB::commit(); } catch (Throwable $th) { DB::rollBack(); - throw $th; + throw $this->prepareException($th); } return $this->response()->successMessage(__('admin.save') . __('admin.successfully')); @@ -87,7 +89,7 @@ abstract class AdminController extends Controller DB::commit(); } catch (Throwable $th) { DB::rollBack(); - throw $th; + throw $this->prepareException($th); } return $this->response()->successMessage(__('admin.delete') . __('admin.successfully')); @@ -103,4 +105,9 @@ abstract class AdminController extends Controller return $path; } + + protected function prepareException(Throwable $e) + { + return $e; + } }