DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 07:47:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #12134 from Godmartinz/custom_report_user_fields_missing

Browse source 
fixes a regression with the csv assigned to fields
This commit is contained in:
snipe 2022-12-07 16:18:32 -08:00 committed by GitHub
parent 1a8b2a169b a02a04d601
commit f7da87520c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/ReportsController.php
View file

@ -763,7 +763,7 @@ class ReportsController extends Controller
if ($request->filled('username')) { if ($request->filled('username')) {
// Only works if we're checked out to a user, not anything else. // Only works if we're checked out to a user, not anything else.
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = ($asset->assignedTo) ? $asset->assignedTo->username : ''; $row[] = ($asset->assignedto) ? $asset->assignedto->username : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
@ -772,7 +772,7 @@ class ReportsController extends Controller
if ($request->filled('employee_num')) { if ($request->filled('employee_num')) {
// Only works if we're checked out to a user, not anything else. // Only works if we're checked out to a user, not anything else.
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = ($asset->assignedTo) ? $asset->assignedTo->employee_num : ''; $row[] = ($asset->assignedto) ? $asset->assignedto->employee_num : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
@ -780,7 +780,7 @@ class ReportsController extends Controller
if ($request->filled('manager')) { if ($request->filled('manager')) {
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = (($asset->assignedTo) && ($asset->assignedTo->manager)) ? $asset->assignedTo->manager->present()->fullName : ''; $row[] = (($asset->assignedto) && ($asset->assignedto->manager)) ? $asset->assignedto->manager->present()->fullName : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
@ -788,7 +788,7 @@ class ReportsController extends Controller
if ($request->filled('department')) { if ($request->filled('department')) {
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = (($asset->assignedTo) && ($asset->assignedTo->department)) ? $asset->assignedTo->department->name : ''; $row[] = (($asset->assignedto) && ($asset->assignedto->department)) ? $asset->assignedto->department->name : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
@ -796,7 +796,7 @@ class ReportsController extends Controller
if ($request->filled('title')) { if ($request->filled('title')) {
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = ($asset->assignedTo) ? $asset->assignedTo->jobtitle : ''; $row[] = ($asset->assignedto) ? $asset->assignedto->jobtitle : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }