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

Merge pull request #12955 from inietov/fixes/error_500_after_sign_and_accept_asset

Browse source 
Fixed Error 500 after sign and accept asset
This commit is contained in:
snipe 2023-05-03 11:43:14 -07:00 committed by GitHub
parent b716f9f55e 6936d76661
commit fc53b56481
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Account/AcceptanceController.php
View file

@ -159,6 +159,9 @@ class AcceptanceController extends Controller
case 'App\Models\Asset':
$pdf_view_route ='account.accept.accept-asset-eula';
$asset_model = AssetModel::find($item->model_id);
if (!$asset_model) {
return redirect()->back()->with('error', trans('admin/models/message.does_not_exist'));
}
$display_model = $asset_model->name;
$assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
break;

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

@ -573,6 +573,10 @@ class AssetsController extends Controller
// 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) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 200);
}
if (($model) && ($model->fieldset)) {
foreach ($model->fieldset->fields as $field) {