mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Check for the additional auth for that user
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
0e2526f627
commit
1d26ccac4e
|
@ -335,13 +335,13 @@ class UsersController extends Controller
|
||||||
*/
|
*/
|
||||||
public function destroy(DeleteUserRequest $request, $id = null)
|
public function destroy(DeleteUserRequest $request, $id = null)
|
||||||
{
|
{
|
||||||
|
|
||||||
$this->authorize('delete', User::class);
|
$this->authorize('delete', User::class);
|
||||||
|
|
||||||
if ($user = User::find($id)) {
|
if ($user = User::find($id)) {
|
||||||
|
|
||||||
if ($user->delete()) {
|
$this->authorize('delete', $user);
|
||||||
|
|
||||||
|
if ($user->delete()) {
|
||||||
if (Storage::disk('public')->exists('avatars/' . $user->avatar)) {
|
if (Storage::disk('public')->exists('avatars/' . $user->avatar)) {
|
||||||
try {
|
try {
|
||||||
Storage::disk('public')->delete('avatars/' . $user->avatar);
|
Storage::disk('public')->delete('avatars/' . $user->avatar);
|
||||||
|
@ -351,7 +351,6 @@ class UsersController extends Controller
|
||||||
}
|
}
|
||||||
return redirect()->route('users.index')->with('success', trans('admin/users/message.success.delete'));
|
return redirect()->route('users.index')->with('success', trans('admin/users/message.success.delete'));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found'));
|
return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found'));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue