From ffa43d2a36b9e4250a457fe9b31c9d312b8fe905 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 11 Apr 2018 20:47:50 -0700 Subject: [PATCH] Use object count instead of php count --- app/Http/Controllers/UsersController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index bf8251b161..027e43bd3a 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -392,9 +392,10 @@ class UsersController extends Controller return redirect()->route('users.index')->with('error', 'This user still has ' . $user->assets()->count() . ' assets associated with them.'); } - if ($user->assets->count() > 0) { + + if ($user->assets->count() > 0) { // Redirect to the user management page - return redirect()->route('users.index')->with('error', 'This user still has ' . count($user->assets->count()) . ' assets associated with them.'); + return redirect()->route('users.index')->with('error', 'This user still has ' . $user->assets->count() . ' assets associated with them.'); } if ($user->licenses()->count() > 0) { @@ -465,8 +466,9 @@ class UsersController extends Controller { $this->authorize('update', User::class); - if (($request->has('ids')) && (count($request->input('ids')) > 0)) { - + if ((!$request->filled('ids')) || (count($request->input('ids')) == 0)) { + return redirect()->back()->with('error', 'No users selected'); + } else { $user_raw_array = $request->input('ids'); $update_array = array(); $manager_conflict = false;