Skip to content

A free open source IT asset/license management system

Fix attempted access of deleted model

Marcus Mooree15de83a9580
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index e5446477cf..529888a5eb 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -163,7 +163,7 @@ class BulkAssetsController extends Controller
$modelNames = [];
foreach($models as $model) {
- $modelNames[] = $model->model->name;
+ $modelNames[] = $model->model?->name;
}
if ($request->filled('bulk_actions')) {
diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php
index d680c6f198..15f1f6ba52 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -5,7 +5,7 @@
@endphp
@foreach($models as $model)
- @if ($model->fieldset ? $model->fieldset->count() > 0 : false)
+ @if (($model) && ($model->fieldset ? $model->fieldset->count() > 0 : false))
@php
$anyModelHasCustomFields++;
@endphp