Skip to content

A free open source IT asset/license management system

Use filter check

snipe4dc5e8bbdb15
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index d147a2cc6d..903ccdb39a 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -171,10 +171,9 @@ class UsersController extends Controller
}
- if ((! is_null($filter)) && (count($filter)) > 0) {
- $users->ByFilter($filter);
- } elseif ($request->filled('search')) {
- $users->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $users->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('activated')) {