DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 23:19:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2017-11-14 16:50:05 -08:00
parent f7c6697a69 f137e516a6
commit e433b0f9d8
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Api/AccessoriesController.php
View file

@ -34,6 +34,10 @@ class AccessoriesController extends Controller
$accessories->where('company_id','=',$request->input('company_id')); $accessories->where('company_id','=',$request->input('company_id'));
} }
if ($request->has('category_id')) {
$accessories->where('category_id','=',$request->input('category_id'));
}
if ($request->has('manufacturer_id')) { if ($request->has('manufacturer_id')) {
$accessories->where('manufacturer_id','=',$request->input('manufacturer_id')); $accessories->where('manufacturer_id','=',$request->input('manufacturer_id'));
} }

10
config/version.php
View file

@ -1,7 +1,7 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.1.3', 'app_version' => 'v4.1.4',
'build_version' => '48', 'build_version' => '173',
'hash_version' => 'g74aa562', 'hash_version' => 'gba38b84',
'full_hash' => 'v4.1.3-48-g74aa562', 'full_hash' => 'v4.1.4-173-gba38b84',
); );