DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-25 20:51:30 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #2821

Browse source
This commit is contained in:
snipe 2016-10-26 11:27:37 -07:00
parent ccb844acd6
commit 691f9b621e
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -333,7 +333,6 @@ class ReportsController extends Controller
$activityCount = $activitylogs->count(); $activityCount = $activitylogs->count();
// dd("Offset:" . $offset . " Limit " . $limit);
$activitylogs = $activitylogs->offset($offset)->limit($limit)->get(); $activitylogs = $activitylogs->offset($offset)->limit($limit)->get();
$rows = array(); $rows = array();
@ -356,7 +355,7 @@ class ReportsController extends Controller
if (($activity->item) && ($activity->itemType()=="asset")) { if (($activity->item) && ($activity->itemType()=="asset")) {
$activity_item = '<a href="'.route('view/hardware', $activity->item_id).'">'.e($activity->item->asset_tag).' - '. e($activity->item->showAssetName()).'</a>'; $activity_item = '<a href="'.route('view/hardware', $activity->item_id).'">'.e($activity->item->asset_tag).' - '. e($activity->item->showAssetName()).'</a>';
$item_type = 'asset'; $item_type = 'asset';
} elseif ($activity->item()) { } elseif ($activity->item) {
$activity_item = '<a href="'.route('view/'. $activity->itemType(), $activity->item_id).'">'.e($activity->item->name).'</a>'; $activity_item = '<a href="'.route('view/'. $activity->itemType(), $activity->item_id).'">'.e($activity->item->name).'</a>';
$item_type = $activity->itemType(); $item_type = $activity->itemType();
} else { } else {