diff --git a/app/Models/Asset.php b/app/Models/Asset.php index eddb4f5e83..29231b22c8 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -656,7 +656,7 @@ class Asset extends Depreciable return Storage::disk('public')->url(app('assets_upload_path').e($this->image)); } elseif ($this->model && ! empty($this->model->image)) { return Storage::disk('public')->url(app('models_upload_path').e($this->model->image)); - } elseif ($this->model->category && ! empty($this->model->category->image)) { + } elseif ($this->model?->category && ! empty($this->model->category->image)) { return Storage::disk('public')->url(app('categories_upload_path').e($this->model->category->image)); } diff --git a/tests/Unit/AssetTest.php b/tests/Unit/AssetTest.php index 743545d9da..f9c1da5cf4 100644 --- a/tests/Unit/AssetTest.php +++ b/tests/Unit/AssetTest.php @@ -239,5 +239,11 @@ class AssetTest extends TestCase $category->save(); $this->assertFalse($asset->refresh()->getImageUrl()); + + // handles case where model does not exist + $asset->model_id = 9999999; + $asset->forceSave(); + + $this->assertFalse($asset->refresh()->getImageUrl()); } }