Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit dc7b9315b527 · 2024-06-19T10:35:54.000+01:00
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -203,9 +203,6 @@ public function index(Request $request)`
`203`	`203`	`$users->where('autoassign_licenses', '=', $request->input('autoassign_licenses'));`
`204`	`204`	`}`
`205`	`205`
`206`		`- if ($request->filled('location_id') != '') {`
`207`		`- $users = $users->UserLocation($request->input('location_id'), $request->input('search'));`
`208`		`- }`
`209`	`206`
`210`	`207`	`if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {`
`211`	`208`	`$users = $users->onlyTrashed();`