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

Use asset tags

Browse source
This commit is contained in:
snipe 2019-08-14 23:13:23 -07:00
parent 7899d2284c
commit da52511bf9
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,10 +119,16 @@ class AssetsController extends Controller
$asset = new Asset(); $asset = new Asset();
$asset->model()->associate(AssetModel::find($request->input('model_id'))); $asset->model()->associate(AssetModel::find($request->input('model_id')));
$asset->name = $request->input('name'); $asset->name = $request->input('name');
// Check for a corresponding serial // Check for a corresponding serial
if (($serials) && (array_key_exists($a, $serials))) { if (($serials) && (array_key_exists($a, $serials))) {
$asset->serial = $serials[$a]; $asset->serial = $serials[$a];
} }
if (($asset_tags) && (array_key_exists($a, $asset_tags))) {
$asset->asset_tag = $asset_tags[$a];
}
$asset->company_id = Company::getIdForCurrentUser($request->input('company_id')); $asset->company_id = Company::getIdForCurrentUser($request->input('company_id'));
$asset->model_id = $request->input('model_id'); $asset->model_id = $request->input('model_id');
$asset->order_number = $request->input('order_number'); $asset->order_number = $request->input('order_number');
@ -146,14 +152,12 @@ class AssetsController extends Controller
// Create the image (if one was chosen.) // Create the image (if one was chosen.)
if ($request->has('image')) { if ($request->has('image')) {
$image = $request->input('image'); $asset = $request->handleImages($asset);
}
$asset = $request->handleImages($asset); // Update custom fields in the database.
} // Validation for these fields is handled through the AssetRequest form request
$model = AssetModel::find($request->get('model_id'));
// Update custom fields in the database.
// Validation for these fields is handled through the AssetRequest form request
$model = AssetModel::find($request->get('model_id'));
if ($model->fieldset) { if ($model->fieldset) {
foreach ($model->fieldset->fields as $field) { foreach ($model->fieldset->fields as $field) {