Merge remote-tracking branch 'origin/develop'

app/Models/Actionlog.php

@@ -69,8 +69,8 @@ class Actionlog extends SnipeModel
      */
     protected $searchableRelations = [
         'company'     => ['name'],
-        'adminuser'   => ['first_name','last_name','username', 'email'],
-        'user'        => ['first_name','last_name','username', 'email'],
+        'adminuser'   => ['first_name','last_name','username', 'email', 'employee_num'],
+        'user'        => ['first_name','last_name','username', 'email', 'employee_num'],
         'assets'      => ['asset_tag','name', 'serial', 'order_number', 'notes', 'purchase_date'],
         'assets.model'              => ['name', 'model_number', 'eol', 'notes'],
         'assets.model.category'     => ['name', 'notes'],

app/Models/Traits/Searchable.php

@@ -164,7 +164,7 @@ trait Searchable
                     }
                 }
                 // I put this here because I only want to add the concat one time in the end of the user relation search
-                if($relation == 'user') {
+                if(($relation == 'adminuser') || ($relation == 'user')) {
                     $query->orWhereRaw(
                             $this->buildMultipleColumnSearch([
                                 'users.first_name',

app/Presenters/HistoryPresenter.php

@@ -45,7 +45,7 @@ class HistoryPresenter extends Presenter
             ],
             [
                 'field' => 'created_by',
-                'searchable' => false,
+                'searchable' => true,
                 'sortable' => true,
                 'title' => trans('general.created_by'),
                 'visible' => true,