From 8e73cacf4ec3369522fe8b789656c2af1c5775f7 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 3 Oct 2017 10:38:28 -0700 Subject: [PATCH] Fixes custom report to include assigned to names, etc --- app/Http/Controllers/ReportsController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index c61ae36a1a..fb2df21840 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -543,8 +543,8 @@ class ReportsController extends Controller if (e(Input::get('assigned_to')) == '1') { - if ($asset->assignedTo) { - $row[] = '"' .e($asset->assignedTo->present()->name()). '"'; + if ($asset->assignedto) { + $row[] = '"' .e($asset->assignedto->present()->name()). '"'; } else { $row[] = ''; // Empty string if unassigned } @@ -553,7 +553,7 @@ class ReportsController extends Controller if (e(Input::get('username')) == '1') { // Only works if we're checked out to a user, not anything else. if ($asset->checkedOutToUser()) { - $row[] = '"' .e($asset->assignedTo->username). '"'; + $row[] = '"' .e($asset->assignedto->username). '"'; } else { $row[] = ''; // Empty string if unassigned } @@ -562,7 +562,7 @@ class ReportsController extends Controller if (e(Input::get('employee_num')) == '1') { // Only works if we're checked out to a user, not anything else. if ($asset->checkedOutToUser()) { - $row[] = '"' .e($asset->assignedTo->employee_num). '"'; + $row[] = '"' .e($asset->assignedto->employee_num). '"'; } else { $row[] = ''; // Empty string if unassigned }