diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php index bc1ac56fc9..66a914e9a9 100755 --- a/app/Http/Controllers/Accessories/AccessoriesController.php +++ b/app/Http/Controllers/Accessories/AccessoriesController.php @@ -220,7 +220,10 @@ class AccessoriesController extends Controller */ public function show(Accessory $accessory) : View | RedirectResponse { - $accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id); + $accessory->loadCount('checkouts as checkouts_count'); + + $accessory->load(['adminuser' => fn($query) => $query->withTrashed()]); + $this->authorize('view', $accessory); return view('accessories.view', compact('accessory')); } diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 137f64fef3..0a9ebdfbd1 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -324,11 +324,7 @@
- @if ($accessory->adminuser) - {{ $accessory->adminuser->present()->fullName() }} - @else - {{ trans('admin/reports/general.deleted_user') }} - @endif +
diff --git a/resources/views/blade/full-user-name.blade.php b/resources/views/blade/full-user-name.blade.php new file mode 100644 index 0000000000..af61b766a7 --- /dev/null +++ b/resources/views/blade/full-user-name.blade.php @@ -0,0 +1,16 @@ +@props([ + 'user' +]) + +@if ($user) + @if (! $user->trashed()) + {{-- if the user is in database but soft-deleted --}} + {{ $user->present()->fullName() }} + @else + {{-- if the user exists --}} + {{ $user->present()->fullName() }} + @endif +@else + {{-- if the user does not exist --}} + Unknown User +@endif