Make sure search in multiple search fields are grouped with OR

jissereitsma · jissereitsma · commit dc066f62708c · 2025-10-21T09:23:56.000+02:00
diff --git a/ProviderHandler/CollectionHandler.php b/ProviderHandler/CollectionHandler.php
@@ -69,9 +69,14 @@ public function getItems(object $provider, GridState $gridState): array
 
         $search = $gridState->getSearch();
         if (!empty($search)) {
+            $searchFields = [];
+            $searchConditions = [];
             foreach ($gridState->getSearchableFields() as $searchableField) {
-                $provider->addFieldToFilter($searchableField, ['like' => '%'.$search.'%']);
+                $searchFields[] = $searchableField;
+                $searchConditions[] = ['like' => '%'.$search.'%'];
             }
+
+            $provider->addFieldToFilter($searchFields, $searchConditions);
         }
 
         foreach ($gridState->getFilters() as $gridFilter) {

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,14 @@ public function getItems(object $provider, GridState $gridState): array`
`69`	`69`
`70`	`70`	`$search = $gridState->getSearch();`
`71`	`71`	`if (!empty($search)) {`
	`72`	`+ $searchFields = [];`
	`73`	`+ $searchConditions = [];`
`72`	`74`	`foreach ($gridState->getSearchableFields() as $searchableField) {`
`73`		`- $provider->addFieldToFilter($searchableField, ['like' => '%'.$search.'%']);`
	`75`	`+ $searchFields[] = $searchableField;`
	`76`	`+ $searchConditions[] = ['like' => '%'.$search.'%'];`
`74`	`77`	`}`
	`78`	`+`
	`79`	`+ $provider->addFieldToFilter($searchFields, $searchConditions);`
`75`	`80`	`}`
`76`	`81`
`77`	`82`	`foreach ($gridState->getFilters() as $gridFilter) {`