DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2017-10-20 17:44:04 -07:00
parent b215924b1a 8ac57d0121
commit b4e1d37b16
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/AssetsController.php
View file

@ -98,7 +98,7 @@ class AssetsController extends Controller
// These are used by the API to query against specific ID numbers // These are used by the API to query against specific ID numbers
if ($request->has('status_id')) { if ($request->has('status_id')) {
$assets->where('status_id', '=', $request->input('status_id')); $assets->where('assets.status_id', '=', $request->input('status_id'));
} }
if ($request->has('model_id')) { if ($request->has('model_id')) {