opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-09-24 15:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #382 from sebapastore/fix381

Browse Source 
Fix bug when applying multiple column search and filter
This commit is contained in:
Dan Harrin
2021-04-23 23:24:35 +01:00
committed by GitHub
parent a94f168eaf a2bb449b71
commit c3e089face
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/tables/src/Concerns/CanSearchRecords.php
+16 -14
View File
@@ -56,21 +56,23 @@ trait CanSearchRecords
return $query;
}
collect($this->getTable()->getColumns())
->filter(fn ($column) => $column->isSearchable())
->each(function ($column) use (&$query) {
foreach ($column->getSearchColumns() as $searchColumn) {
if ($this->isRelationshipSearch($searchColumn)) {
$query = $this->applyRelationshipSearch($query, $searchColumn);
} else {
$query = $query->{$this->hasNoSearchQueriesApplied() ? 'where' : 'orWhere'}(
fn ($query) => $query->where($searchColumn, $this->getSearchOperator(), "%{$this->getSearch()}%"),
);
}
$query->where(function ($query) {
collect($this->getTable()->getColumns())
->filter(fn ($column) => $column->isSearchable())
->each(function ($column) use (&$query) {
foreach ($column->getSearchColumns() as $searchColumn) {
if ($this->isRelationshipSearch($searchColumn)) {
$query = $this->applyRelationshipSearch($query, $searchColumn);
} else {
$query->{$this->hasNoSearchQueriesApplied() ? 'where' : 'orWhere'}(
$searchColumn, $this->getSearchOperator(), "%{$this->getSearch()}%"
);
}
$this->hasSearchQueriesApplied = true;
}
});
$this->hasSearchQueriesApplied = true;
}
});
});
return $query;
}