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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2020-11-20 14:35:12 -08:00
commit 98dfb9d1b5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ class UsersController extends Controller
if (($request->filled('deleted')) && ($request->input('deleted')=='true')) { if (($request->filled('deleted')) && ($request->input('deleted')=='true')) {
$users = $users->onlyTrashed(); $users = $users->onlyTrashed();
} elseif (($request->filled('all')) && ($request->input('deleted')=='true')) { } elseif (($request->filled('all')) && ($request->input('all')=='true')) {
$users = $users->withTrashed(); $users = $users->withTrashed();
} }