From a7e12931fa1e76a967711dceb55fa3c652c13524 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 22 Nov 2017 18:42:17 -0800 Subject: [PATCH 1/2] Check that assigned is an object in reports controller --- app/Http/Controllers/ReportsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index c60b33fcb3..c646e9e6ef 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -183,8 +183,8 @@ class ReportsController extends Controller ($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '', ($asset->order_number) ? e($asset->order_number) : '', ($asset->supplier) ? e($asset->supplier->name) : '', - ($asset->checkedOutToUser()) ? e($asset->assigned->getFullNameAttribute()) : ($asset->assigned ? e($asset->assigned->display_name) : ''), - ($asset->checkedOutToUser()) ? 'user' : e($asset->assignedType()), + ($asset->checkedOutToUser() && $asset->assigned) ? e($asset->assigned->getFullNameAttribute()) : ($asset->assigned ? e($asset->assigned->display_name) : ''), + ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : e($asset->assignedType()), ($asset->last_checkout!='') ? e($asset->last_checkout) : '', ($asset->location) ? e($asset->location->name) : '', ($asset->notes) ? e($asset->notes) : '', From 76e3398d44a69fcec657c322c3d9310e8be850e1 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 22 Nov 2017 18:42:33 -0800 Subject: [PATCH 2/2] Auto-bumped hash/version --- config/version.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/version.php b/config/version.php index f019c5fe92..7884850206 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2781-gfe986f7', - 'build_version' => '2781', + 'full_app_version' => 'v4.1.6-pre - build 2783-gba04c64', + 'build_version' => '2783', 'prerelease_version' => '', - 'hash_version' => 'gfe986f7', - 'full_hash' => 'v4.1.5-35-gfe986f7', + 'hash_version' => 'gba04c64', + 'full_hash' => 'v4.1.5-53-gba04c64', 'branch' => 'develop', ); \ No newline at end of file