DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Guard against null values in the reports generator. May fix #2758 (#2762)

Browse source
This commit is contained in:
Daniel Meltzer 2016-10-12 14:06:38 -05:00 committed by snipe
parent 2e0a7abbe9
commit 8e60767c00
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -367,14 +367,30 @@ class ReportsController extends Controller
if (($activity->user) && ($activity->action_type=="uploaded") && ($activity->itemType()=="user")) { if (($activity->user) && ($activity->action_type=="uploaded") && ($activity->itemType()=="user")) {
$activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->user->fullName().'</a>'; $activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->user->fullName().'</a>';
} elseif (($activity->item) && ($activity->target_type === "App\Models\Asset")) { } elseif ($activity->target_type === "App\Models\Asset") {
if($activity->target) {
$activity_target = '<a href="'.route('view/hardware', $activity->target_id).'">'.$activity->target->showAssetName().'</a>'; $activity_target = '<a href="'.route('view/hardware', $activity->target_id).'">'.$activity->target->showAssetName().'</a>';
} else {
$activity_target = "Unknown Item";
}
} elseif ( $activity->target_type === "App\Models\User") { } elseif ( $activity->target_type === "App\Models\User") {
if($activity->target()) {
$activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->target->fullName().'</a>'; $activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->target->fullName().'</a>';
} else {
$activity_target = 'Unknown User';
}
} elseif ($activity->action_type=='requested') { } elseif ($activity->action_type=='requested') {
if ($activity->user) {
$activity_target = '<a href="'.route('view/user', $activity->user_id).'">'.$activity->user->fullName().'</a>'; $activity_target = '<a href="'.route('view/user', $activity->user_id).'">'.$activity->user->fullName().'</a>';
} else { } else {
$activity_target = 'Unknown User';
}
} else {
if($activity->target) {
$activity_target = $activity->target->id; $activity_target = $activity->target->id;
} else {
$activity_target = "Unknown";
}
} }