Skip to content

Commit

Permalink
Fixed search in Dynamics list
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasduenser committed Feb 22, 2024
1 parent b01747b commit d5ba6f2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Controller/DynamicController.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ protected function getFilters(Request $request): array
'fromDate' => $request->get('fromDate'),
'toDate' => $request->get('toDate'),
'search' => $request->get('search'),
'searchFields' => \array_filter(\explode(',', $request->get('searchFields', ''))),
'searchFields' => \array_filter(\explode(',', $request->get('fields', ''))),
];

return \array_filter($filters);
Expand Down
12 changes: 5 additions & 7 deletions Repository/DynamicRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,12 @@ protected function addSearchFilter(QueryBuilder $queryBuilder, ?string $search,

// Search each term in each search field
foreach ($terms as $counter => $term) {
$expressions = [];

foreach ($searchFields as $searchField) {
$expressions[] = $queryBuilder->expr()->like(
'dynamic.' . $searchField,
$expressions = [
$queryBuilder->expr()->like(
'dynamic.data',
':searchTerm' . $counter
);
}
),
];

$queryBuilder->andWhere(\call_user_func_array([$queryBuilder->expr(), 'orX'], $expressions));
$queryBuilder->setParameter('searchTerm' . $counter, '%' . $term . '%');
Expand Down

0 comments on commit d5ba6f2

Please sign in to comment.