Skip to content

Commit fd71b48

Browse files
authored
Merge pull request #11000 from inietov/fixes/download_all_triggers_getDisplayNameAttribute_on_null
Fixes Activity Report Download all action fails creating the CSV report.
2 parents 5a8c344 + 1cbbf8f commit fd71b48

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

app/Http/Controllers/ReportsController.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,18 @@ public function postActivityReport(Request $request)
272272
}
273273
}
274274

275+
if($actionlog->item){
276+
$item_name = e($actionlog->item->getDisplayNameAttribute());
277+
} else {
278+
$item_name ='';
279+
}
275280

276281
$row = [
277282
$actionlog->created_at,
278283
($actionlog->user) ? e($actionlog->user->getFullNameAttribute()) : '',
279284
$actionlog->present()->actionType(),
280285
e($actionlog->itemType()),
281-
($actionlog->itemType()=='user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()),
286+
($actionlog->itemType()=='user') ? $actionlog->filename : $item_name,
282287
$target_name,
283288
($actionlog->note) ? e($actionlog->note): '',
284289
$actionlog->log_meta,

0 commit comments

Comments
 (0)