mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-11 22:07:29 -08:00
Merge pull request #9797 from markbrule/fixes/search_parameter_checkedout_api
Fixed #9671: wrap OR queries in sub-condition in checkedout search
This commit is contained in:
commit
593e1234a5
|
@ -171,9 +171,13 @@ class AccessoriesController extends Controller
|
||||||
|
|
||||||
if ($request->filled('search')) {
|
if ($request->filled('search')) {
|
||||||
$accessory_users = $accessory->users()
|
$accessory_users = $accessory->users()
|
||||||
->where('first_name', 'like', '%'.$request->input('search').'%')
|
->where(function ($query) use ($request) {
|
||||||
->orWhere('last_name', 'like', '%'.$request->input('search').'%')
|
$search_str = '%' . $request->input('search') . '%';
|
||||||
->get();
|
$query->where('first_name', 'like', $search_str)
|
||||||
|
->orWhere('last_name', 'like', $search_str)
|
||||||
|
->orWhere('note', 'like', $search_str);
|
||||||
|
})
|
||||||
|
->get();
|
||||||
$total = $accessory_users->count();
|
$total = $accessory_users->count();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue