mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-26 06:04:08 -08:00
Merge pull request #12118 from snipe/features/adds_asset_tag_and_serial_to_api
Allow searching firectly for asset tag and serial
This commit is contained in:
commit
2166fcec41
|
@ -120,7 +120,6 @@ class AssetsController extends Controller
|
||||||
|
|
||||||
if ($filter_non_deprecable_assets) {
|
if ($filter_non_deprecable_assets) {
|
||||||
$non_deprecable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get();
|
$non_deprecable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get();
|
||||||
|
|
||||||
$assets->InModelList($non_deprecable_models->toArray());
|
$assets->InModelList($non_deprecable_models->toArray());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -141,6 +140,14 @@ class AssetsController extends Controller
|
||||||
$assets->where('assets.status_id', '=', $request->input('status_id'));
|
$assets->where('assets.status_id', '=', $request->input('status_id'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($request->filled('asset_tag')) {
|
||||||
|
$assets->where('assets.asset_tag', '=', $request->input('asset_tag'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($request->filled('serial')) {
|
||||||
|
$assets->where('assets.serial', '=', $request->input('serial'));
|
||||||
|
}
|
||||||
|
|
||||||
if ($request->input('requestable') == 'true') {
|
if ($request->input('requestable') == 'true') {
|
||||||
$assets->where('assets.requestable', '=', '1');
|
$assets->where('assets.requestable', '=', '1');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue