Fix French translations

[bookstack] / app / Http / Controllers / AuditLogController.php

diff --git a/app/Http/Controllers/AuditLogController.php b/app/Http/Controllers/AuditLogController.php
index a3ef01baa472ec923de70068abcc84ee2fe09439..eb6eecc944ec0ba29567b2147b5d88af4f39d437 100644 (file)
--- a/app/Http/Controllers/AuditLogController.php
+++ b/app/Http/Controllers/AuditLogController.php
@@ -23,11 +23,16 @@ class AuditLogController extends Controller
         ];
 
         $query = Activity::query()
         ];
 
         $query = Activity::query()

-            ->with(['entity', 'user'])
+            ->with([
+                'entity' => function ($query) {
+                    $query->withTrashed();
+                },
+                'user'
+            ])

             ->orderBy($listDetails['sort'], $listDetails['order']);
 
         if ($listDetails['event']) {
             ->orderBy($listDetails['sort'], $listDetails['order']);
 
         if ($listDetails['event']) {

-            $query->where('key', '=', $listDetails['event']);
+            $query->where('type', '=', $listDetails['event']);

         }
 
         if ($listDetails['date_from']) {
         }
 
         if ($listDetails['date_from']) {


@@ -40,12 +45,12 @@ class AuditLogController extends Controller
         $activities = $query->paginate(100);
         $activities->appends($listDetails);
 
         $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,
         $this->setPageTitle(trans('settings.audit'));
         return view('settings.audit', [
             'activities' => $activities,
             'listDetails' => $listDetails,

-            'activityKeys' => $keys,
+            'activityTypes' => $types,

         ]);
     }
 }
         ]);
     }
 }