mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-02 08:21:09 -08:00
Add query to search into the per-component view
This commit is contained in:
parent
7eaf3174ab
commit
993918f47c
|
@ -13,6 +13,7 @@ use App\Events\CheckoutableCheckedIn;
|
||||||
use App\Events\ComponentCheckedIn;
|
use App\Events\ComponentCheckedIn;
|
||||||
use App\Models\Asset;
|
use App\Models\Asset;
|
||||||
use Illuminate\Support\Facades\Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
use Illuminate\Database\Query\Builder;
|
||||||
|
|
||||||
class ComponentsController extends Controller
|
class ComponentsController extends Controller
|
||||||
{
|
{
|
||||||
|
@ -210,6 +211,21 @@ class ComponentsController extends Controller
|
||||||
$total = $assets->count();
|
$total = $assets->count();
|
||||||
$assets = $assets->skip($offset)->take($limit)->get();
|
$assets = $assets->skip($offset)->take($limit)->get();
|
||||||
|
|
||||||
|
if ($request->filled('search')) {
|
||||||
|
$assets = $component->assets()
|
||||||
|
->where(function ($query) use ($request) {
|
||||||
|
$search_str = '%' . $request->input('search') . '%';
|
||||||
|
$query->where('name', 'like', $search_str)
|
||||||
|
->orWhereIn('model_id', function (Builder $query) use ($request) {
|
||||||
|
$search_str = '%' . $request->input('search') . '%';
|
||||||
|
$query->selectRaw('id')->from('models')->where('name', 'like', $search_str);
|
||||||
|
})
|
||||||
|
->orWhere('asset_tag', 'like', $search_str);
|
||||||
|
})
|
||||||
|
->get();
|
||||||
|
$total = $assets->count();
|
||||||
|
}
|
||||||
|
|
||||||
return (new ComponentsTransformer)->transformCheckedoutComponents($assets, $total);
|
return (new ComponentsTransformer)->transformCheckedoutComponents($assets, $total);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue