diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php index ea80a21bfa..dd8dcb2c44 100755 --- a/app/Models/Actionlog.php +++ b/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'], diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php index 1430ce649a..fb4d9b30ca 100644 --- a/app/Models/Traits/Searchable.php +++ b/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', diff --git a/app/Presenters/HistoryPresenter.php b/app/Presenters/HistoryPresenter.php index 4b5d7d1f2b..e259400c22 100644 --- a/app/Presenters/HistoryPresenter.php +++ b/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,