Skip to content

Commit 011ab60

Browse files
authored
Merge pull request #11001 from inietov/fixes/download_all_triggers_getDisplayNameAttribute_on_null_develop
Fixes Activity Report Download all action fails creating the CSV report for develop.
2 parents 313150e + ac8da55 commit 011ab60

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
@@ -275,13 +275,18 @@ public function postActivityReport(Request $request)
275275
}
276276
}
277277

278+
if($actionlog->item){
279+
$item_name = e($actionlog->item->getDisplayNameAttribute());
280+
} else {
281+
$item_name = '';
282+
}
278283

279284
$row = [
280285
$actionlog->created_at,
281286
($actionlog->user) ? e($actionlog->user->getFullNameAttribute()) : '',
282287
$actionlog->present()->actionType(),
283288
e($actionlog->itemType()),
284-
($actionlog->itemType() == 'user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()),
289+
($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,
285290
$target_name,
286291
($actionlog->note) ? e($actionlog->note) : '',
287292
$actionlog->log_meta,

0 commit comments

Comments
 (0)