diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 90f585f248..ddacdb9746 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1440,21 +1440,23 @@ - @can('view', $asset->model) -
-
-
+ @if ($asset->model) + @can('view', $asset->model) +
+
+
- + -
-
-
- @endcan +
+
+
+ @endcan + @endif diff --git a/tests/Feature/Assets/Ui/ShowAssetTest.php b/tests/Feature/Assets/Ui/ShowAssetTest.php new file mode 100644 index 0000000000..23b6c8f31e --- /dev/null +++ b/tests/Feature/Assets/Ui/ShowAssetTest.php @@ -0,0 +1,26 @@ +create(); + + $asset->model_id = null; + $asset->forceSave(); + + $asset->refresh(); + + $this->assertNull($asset->fresh()->model_id, 'This test needs model_id to be null to be helpful.'); + + $this->actingAs(User::factory()->superuser()->create()) + ->get(route('hardware.show', $asset)) + ->assertOk(); + } +}