DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use object count instead of php count

Browse source
This commit is contained in:
snipe 2018-04-11 20:47:50 -07:00 committed by Daniel Meltzer
parent 54b5a47847
commit ffa43d2a36
No known key found for this signature in database
GPG key ID: 91C5C7B09A5B1CA0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/UsersController.php
View file

@ -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;