diff --git a/src/EloquentDataTable.php b/src/EloquentDataTable.php index edcb9294..36495c52 100644 --- a/src/EloquentDataTable.php +++ b/src/EloquentDataTable.php @@ -155,8 +155,7 @@ protected function isMorphRelation($relation) } /** - * Resolve the proper column name be used. - * + * {@inheritDoc} * * @throws \Yajra\DataTables\Exceptions\Exception */ diff --git a/src/QueryDataTable.php b/src/QueryDataTable.php index 09d4fa46..9c1eefe9 100644 --- a/src/QueryDataTable.php +++ b/src/QueryDataTable.php @@ -350,7 +350,7 @@ protected function applyFilterColumn($query, string $columnName, string $keyword $builder = $this->query->newQuery(); } - $callback($builder, $keyword); + $callback($builder, $keyword, fn ($column) => $this->resolveRelationColumn($column)); /** @var \Illuminate\Database\Query\Builder $baseQueryBuilder */ $baseQueryBuilder = $this->getBaseQueryBuilder($builder); @@ -384,7 +384,7 @@ public function getQuery(): QueryBuilder } /** - * Resolve the proper column name be used. + * Resolve the proper column name to be used. */ protected function resolveRelationColumn(string $column): string { @@ -646,7 +646,7 @@ protected function searchPanesSearch(): void */ protected function resolveCallbackParameter(): array { - return [$this->query, $this->scoutSearched]; + return [$this->query, $this->scoutSearched, fn ($column) => $this->resolveRelationColumn($column)]; } /**