From 01342ca266d94607c7400df7825217ef0d8a9ebd Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 5 Apr 2022 22:58:25 +0100
Subject: [PATCH] Fixed activity report

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Actionlog.php                   | 5 +++--
 resources/views/reports/activity.blade.php | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php
index 7540568387..41a8feb64f 100755
--- a/app/Models/Actionlog.php
+++ b/app/Models/Actionlog.php
@@ -30,7 +30,7 @@ class Actionlog extends SnipeModel
      * 
      * @var array
      */
-    protected $searchableAttributes = ['action_type', 'note', 'log_meta'];
+    protected $searchableAttributes = ['action_type', 'note', 'log_meta','user_id'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -38,7 +38,8 @@ class Actionlog extends SnipeModel
      * @var array
      */
     protected $searchableRelations = [
-        'company' => ['name']
+        'company' => ['name'],
+        'user' => ['first_name','last_name','username'],
     ];
 
     /**
diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php
index 5f9bddfcec..d9e96d2c94 100644
--- a/resources/views/reports/activity.blade.php
+++ b/resources/views/reports/activity.blade.php
@@ -35,7 +35,6 @@
                         id="activityReport"
                         data-url="{{ route('api.activity.index') }}"
                         data-mobile-responsive="true"
-                        data-toggle="table"
                         class="table table-striped snipe-table"
                         data-export-options='{
                         "fileName": "activity-report-{{ date('Y-m-d') }}",
@@ -46,7 +45,7 @@
                         <tr>
                             <th data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">Icon</th>
                             <th class="col-sm-3" data-searchable="false" data-sortable="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                            <th class="col-sm-2" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
+                            <th class="col-sm-2" data-searchable="true" data-sortable="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
                             <th class="col-sm-2" data-field="action_type">{{ trans('general.action') }}</th>
                             <th class="col-sm-1" data-field="type" data-formatter="itemTypeFormatter">{{ trans('general.type') }}</th>
                             <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>