lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Prevent to delete a user if still has consumables associated to them

Browse source
This commit is contained in:
Ivan Nieto Vivanco 2022-08-11 17:01:52 -05:00
parent c7d9baad8e
commit db53a00d3f
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Api/UsersController.php
View file

@ -441,6 +441,10 @@ class UsersController extends Controller
return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->accessories->count().' accessories associated with them.')); return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->accessories->count().' accessories associated with them.'));
} }
if (($user->consumables) && ($user->consumables->count() > 0)) {
return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->consumables->count().' consumables associated with them.'));
}
if (($user->managedLocations()) && ($user->managedLocations()->count() > 0)) { if (($user->managedLocations()) && ($user->managedLocations()->count() > 0)) {
return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->managedLocations()->count().' locations that they manage.')); return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->managedLocations()->count().' locations that they manage.'));
} }

6
app/Http/Controllers/Users/UsersController.php
View file

@ -348,6 +348,12 @@ class UsersController extends Controller
->with('error', 'This user still has '.$accessoriesCount.' accessories associated with them.'); ->with('error', 'This user still has '.$accessoriesCount.' accessories associated with them.');
} }
if (($user->consumables()) && (($consumablesCount = $user->consumables()->count())) > 0) {
// Redirect to the user management page
return redirect()->route('users.index')
->with('error', 'This user still has '.$consumablesCount.' consumables associated with them.');
}
if (($user->managedLocations()) && (($managedLocationsCount = $user->managedLocations()->count())) > 0) { if (($user->managedLocations()) && (($managedLocationsCount = $user->managedLocations()->count())) > 0) {
// Redirect to the user management page // Redirect to the user management page
return redirect()->route('users.index') return redirect()->route('users.index')