From 8a70f09dd3fff6c24953af413656309bc8b8ddd4 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 20 Feb 2025 12:19:31 +0000 Subject: [PATCH] =?UTF-8?q?Temp=20=E2=80=9Cfix=E2=80=9D=20RMB=20for=20soft?= =?UTF-8?q?-deleted=20users?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- app/Http/Requests/DeleteUserRequest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Requests/DeleteUserRequest.php b/app/Http/Requests/DeleteUserRequest.php index 1c200e4eba..6d387917c6 100644 --- a/app/Http/Requests/DeleteUserRequest.php +++ b/app/Http/Requests/DeleteUserRequest.php @@ -24,11 +24,11 @@ class DeleteUserRequest extends FormRequest public function prepareForValidation(): void { - $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user.id')); + $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user')); if ($user_to_delete) { $this->merge([ - 'user' => request()->route('user')->id, + 'user' => request()->route('user'), 'admin_id' => auth()->id(), 'managed_users' => $user_to_delete->managesUsers()->count(), 'managed_locations' => $user_to_delete->managedLocations()->count(), @@ -61,7 +61,8 @@ class DeleteUserRequest extends FormRequest public function messages(): array { - $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user.id')); + $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user')); + $messages = []; if ($user_to_delete) {