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

Fixed wonky merge :(

Browse source
This commit is contained in:
snipe 2019-02-13 06:52:36 -08:00
parent 533649f24e
commit cd333fa93b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -362,7 +362,7 @@ class AssetsController extends Controller
'assets.assigned_to',
'assets.assigned_type',
'assets.status_id'
])->with('model', 'assetstatus', 'assignedTo')->NotArchived());
])->with('model', 'assetstatus', 'assignedTo')->NotArchived(), 'company_id', 'assets');
if ($request->filled('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
$assets = $assets->RTD();

3
app/Http/Controllers/Assets/AssetsController.php
View file

@ -156,8 +156,9 @@ class AssetsController extends Controller
$image = $request->input('image');
$asset->asset_tag = $asset_tags[$a];
$asset->asset_tag = $asset_tags[$a];
$asset = $request->handleImages($asset);
}
// Update custom fields in the database.