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

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-01-17 13:12:58 -08:00
parent e35b3745eb d920d91786
commit f08bec6c78
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,26 +447,24 @@ class AssetsController extends Controller
($request->has('company_id')) ? ($request->has('company_id')) ?
$asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : ''; $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';
if ($request->has('model_id')) {
if (($model = AssetModel::find($request->get('model_id'))) && (isset($model->fieldset))) { // Update custom fields
foreach ($model->fieldset->fields as $field) { if (($model = AssetModel::find($asset->model_id)) && (isset($model->fieldset))) {
if ($request->has($field->convertUnicodeDbSlug())) { foreach ($model->fieldset->fields as $field) {
$asset->{$field->convertUnicodeDbSlug()} = e($request->input($field->convertUnicodeDbSlug())); if ($request->has($field->convertUnicodeDbSlug())) {
} $asset->{$field->convertUnicodeDbSlug()} = e($request->input($field->convertUnicodeDbSlug()));
} }
} }
} }
if ($asset->save()) { if ($asset->save()) {
if ($request->get('assigned_user')) { if (($request->has('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
$target = User::find(request('assigned_user')); $location = $target->location_id;
$location = $target->location_id; } elseif (($request->has('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
} elseif ($request->get('assigned_asset')) { $location = $target->location_id;
$target = Asset::find(request('assigned_asset')); } elseif (($request->has('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
$location = $target->location_id;
} elseif ($request->get('assigned_location')) {
$target = Location::find(request('assigned_location'));
$location = $target->id; $location = $target->id;
} }