Skip to content

Commit be81e74

Browse files
committed
Shifted log meta position
Signed-off-by: snipe <[email protected]>
1 parent 2bee872 commit be81e74

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

app/Http/Controllers/ReportsController.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -274,22 +274,18 @@ public function postActivityReport(Request $request) : StreamedResponse
274274
$target_name = '';
275275

276276
if ($actionlog->target) {
277-
if ($actionlog->targetType() == 'user') {
278-
$target_name = $actionlog->target->display_name;
279-
} else {
280-
$target_name = $actionlog->target->getDisplayNameAttribute();
281-
}
277+
$target_name = $actionlog->target->display_name;
282278
}
283279

284-
if($actionlog->item){
285-
$item_name = e($actionlog->item->getDisplayNameAttribute());
280+
if ($actionlog->item){
281+
$item_name = e($actionlog->item->display_name);
286282
} else {
287283
$item_name = '';
288284
}
289285

290286
$row = [
291287
$actionlog->created_at,
292-
($actionlog->adminuser) ? e($actionlog->adminuser->display_name) : '',
288+
($actionlog->adminuser) ? $actionlog->adminuser->display_name : '',
293289
$actionlog->present()->actionType(),
294290
e($actionlog->itemType()),
295291
($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,
@@ -298,10 +294,10 @@ public function postActivityReport(Request $request) : StreamedResponse
298294
(($actionlog->item) && ($actionlog->item->model)) ? $actionlog->item->model->model_number : null,
299295
$target_name,
300296
($actionlog->note) ? e($actionlog->note) : '',
301-
$actionlog->log_meta,
302297
$actionlog->remote_ip,
303298
$actionlog->user_agent,
304299
$actionlog->action_source,
300+
$actionlog->log_meta,
305301
];
306302
fputcsv($handle, $row);
307303
}

0 commit comments

Comments
 (0)