From e0668b7507466fb15614806f3e1fc6f6f412e187 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 16 Oct 2017 21:19:06 -0700 Subject: [PATCH 1/2] Handle references to suppliers that have been deleted --- resources/views/hardware/view.blade.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 45f5beec95..6ae1746fbf 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -544,7 +544,13 @@ @foreach ($asset->assetmaintenances as $assetMaintenance) @if (is_null($assetMaintenance->deleted_at)) - {{ $assetMaintenance->supplier->name }} + + @if ($assetMaintenance->supplier) + {{ $assetMaintenance->supplier->name }} + @else + (deleted supplier) + @endif + {{ $assetMaintenance->title }} {{ $assetMaintenance->asset_maintenance_type }} {{ $assetMaintenance->start_date }} From 02db0f9f9dcb083d03285a669cc516b950ab9b80 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 16 Oct 2017 21:28:05 -0700 Subject: [PATCH 2/2] Handle deleted assets in maintenance --- resources/views/suppliers/view.blade.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php index a1e5525ec2..068e0d548e 100755 --- a/resources/views/suppliers/view.blade.php +++ b/resources/views/suppliers/view.blade.php @@ -200,7 +200,13 @@ @foreach ($supplier->asset_maintenances as $improvement) @if (is_null($improvement->deleted_at)) - {{ $improvement->asset->name }} + + @if ($improvement->asset) + {{ $improvement->asset->name }} + @else + (deleted asset) + @endif + {{ $improvement->asset_maintenance_type }} {{ $improvement->start_date }} {{ $improvement->completion_date }}