X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ff46d81681eead543d397cbb1de33ad07a4cb94f..refs/pull/2700/head:/app/Http/Controllers/AuditLogController.php diff --git a/app/Http/Controllers/AuditLogController.php b/app/Http/Controllers/AuditLogController.php index a3ef01baa..f73ee4a20 100644 --- a/app/Http/Controllers/AuditLogController.php +++ b/app/Http/Controllers/AuditLogController.php @@ -20,14 +20,23 @@ class AuditLogController extends Controller 'sort' => $request->get('sort', 'created_at'), 'date_from' => $request->get('date_from', ''), 'date_to' => $request->get('date_to', ''), + 'user' => $request->get('user', ''), ]; $query = Activity::query() - ->with(['entity', 'user']) + ->with([ + 'entity' => function ($query) { + $query->withTrashed(); + }, + 'user' + ]) ->orderBy($listDetails['sort'], $listDetails['order']); if ($listDetails['event']) { - $query->where('key', '=', $listDetails['event']); + $query->where('type', '=', $listDetails['event']); + } + if ($listDetails['user']) { + $query->where('user_id', '=', $listDetails['user']); } if ($listDetails['date_from']) { @@ -40,12 +49,12 @@ class AuditLogController extends Controller $activities = $query->paginate(100); $activities->appends($listDetails); - $keys = DB::table('activities')->select('key')->distinct()->pluck('key'); + $types = DB::table('activities')->select('type')->distinct()->pluck('type'); $this->setPageTitle(trans('settings.audit')); return view('settings.audit', [ 'activities' => $activities, 'listDetails' => $listDetails, - 'activityKeys' => $keys, + 'activityTypes' => $types, ]); } }