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

Use user object to prevent errors on deleted users

Browse source
This commit is contained in:
snipe 2016-09-29 11:37:38 -07:00
parent 0a218a37d0
commit b41883c125
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -516,15 +516,13 @@ class ReportsController extends Controller
$row[] = ''; $row[] = '';
} }
} }
if (e(Input::get('location')) == '1') { if (e(Input::get('location')) == '1') {
$show_loc = ''; $show_loc = '';
if (( $asset->assigned_to > 0 ) && ( $asset->assigneduser) && ( $asset->assigneduser->location_id !='' )) {
$location = Location::find($asset->assigneduser->location_id);
if ($location) { if (($asset->assigned_to > 0) && ($asset->assigneduser) && ($asset->assigneduser->location)) {
$show_loc .= '"' .e($location->name). '"'; $show_loc .= '"' .e($asset->assigneduser->location->name). '"';
} else {
$show_loc .= 'User location '.$asset->assigneduser->location_id.' is invalid';
}
} elseif ($asset->rtd_location_id!='') { } elseif ($asset->rtd_location_id!='') {
$location = Location::find($asset->rtd_location_id); $location = Location::find($asset->rtd_location_id);
if ($location) { if ($location) {
@ -537,19 +535,19 @@ class ReportsController extends Controller
$row[] = $show_loc; $row[] = $show_loc;
} }
if (e(Input::get('assigned_to')) == '1') { if (e(Input::get('assigned_to')) == '1') {
if ($asset->assigned_to > 0) { if ($asset->assigneduser) {
$user = User::find($asset->assigned_to); $row[] = '"' .e($asset->assigneduser->fullName()). '"';
$row[] = '"' .e($user->fullName()). '"';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
} }
if (e(Input::get('username')) == '1') { if (e(Input::get('username')) == '1') {
if ($asset->assigned_to > 0) { if ($asset->assigneduser) {
$user = User::find($asset->assigned_to); $row[] = '"' .e($asset->assigneduser->username). '"';
$row[] = '"' .e($user->username). '"';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }