From 11505d5d06c757cc101cf728597edf4318a9ab87 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 25 Jan 2018 00:25:43 -0800 Subject: [PATCH] Fix crash if no asset model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (This should never happen, but shouldn’t crash if/when it does) --- app/Http/Controllers/ReportsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 834aa91db..c8ce28f0c 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -624,7 +624,7 @@ class ReportsController extends Controller } if ($request->has('category')) { - $row[] = ($asset->model->category) ? $asset->model->category->name : ''; + $row[] = (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : ''; } if ($request->has('manufacturer')) {