Skip to content

Commit 4efaca8

Browse files
committed
Changed default operator for search parameter
1 parent 15e5e75 commit 4efaca8

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/Controllers/LaravelController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ protected function parseExcludeGlobalScopes(array $excludeGlobalScopes)
241241
* @param bool $or
242242
* @return array
243243
*/
244-
protected function parseFilters(array $filters, $or = false)
244+
protected function parseFilters(array $filters, $or = false, $defaultOperator = 'eq')
245245
{
246246
if (!count($filters)) {
247247
return [];
@@ -263,11 +263,11 @@ protected function parseFilters(array $filters, $or = false)
263263

264264
foreach ($filters as $column => $part) {
265265
$arrayCountValues = is_array($part) ? count($part, COUNT_RECURSIVE) : 0;
266-
$operator = 'eq';
266+
$operator = $defaultOperator;
267267
$not = false;
268268
$value = (is_array($part)) ? null : $part;
269269
if (is_array($part)) {
270-
$operator = key($part) ?? 'eq';
270+
$operator = key($part) ?? $defaultOperator;
271271
}
272272

273273
if ($arrayCountValues > 2) {
@@ -400,8 +400,8 @@ protected function parseResourceOptions($request = null)
400400
$filter_groups = $this->parseFilterGroups($request->get('filter_groups', $this->defaults['filter_groups']));
401401
$filterByAnd = $this->parseFilters($request->get('filter', $this->defaults['filterByAnd']));
402402
$filterByOr = $this->parseFilters($request->get('filterByOr', $this->defaults['filterByOr']), true);
403-
$searchByAnd = $this->parseFilters($request->get('search', $this->defaults['searchByAnd']));
404-
$searchByOr = $this->parseFilters($request->get('searchByOr', $this->defaults['searchByOr']), true);
403+
$searchByAnd = $this->parseFilters($request->get('search', $this->defaults['searchByAnd']), false, 'ct');
404+
$searchByOr = $this->parseFilters($request->get('searchByOr', $this->defaults['searchByOr']), true, 'ct');
405405
$append = $request->get('append', $this->defaults['append']);
406406
$sortByDesc = $this->parseSortByDesc($request->get('sortByDesc', $this->defaults['sortByDesc']));
407407
$sortByAsc = $this->parseSortByAsc($request->get('sortByAsc', $this->defaults['sortByAsc']));

0 commit comments

Comments
 (0)