DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-08 04:17:32 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-11 12:29:48 -07:00
parent c15c082fb4 f56eb16941
commit 2fda3a2d26
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

@ -125,7 +125,7 @@ class AssetsController extends Controller
$assets->ByManufacturer($request->input('manufacturer_id')); $assets->ByManufacturer($request->input('manufacturer_id'));
} }
$request->has('order_number') ? $assets = $assets->where('order_number', '=', e($request->get('order_number'))) : ''; $request->has('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : '';
$offset = request('offset', 0); $offset = request('offset', 0);
$limit = $request->input('limit', 50); $limit = $request->input('limit', 50);