Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
snipe committed Jun 19, 2024
2 parents 5d2cca8 + 6c17b14 commit dc7b931
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions app/Http/Controllers/Api/UsersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,6 @@ public function index(Request $request)
$users->where('autoassign_licenses', '=', $request->input('autoassign_licenses'));
}

if ($request->filled('location_id') != '') {
$users = $users->UserLocation($request->input('location_id'), $request->input('search'));
}

if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {
$users = $users->onlyTrashed();
Expand Down

0 comments on commit dc7b931

Please sign in to comment.