STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

support the | (or) operator

Browse Source
This commit is contained in:
James Collins
2023-09-11 21:03:12 +10:00
parent 8451cc1547
commit 4252878019
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Conductors/Conductor.php
View File

@@ -157,7 +157,6 @@ class Conductor
}
$filterFields += $this->defaultFilters;
foreach ($filterFields as $field => $value) {
if (
is_array($limitFields) === false ||
@@ -168,7 +167,7 @@ class Conductor
$join = 'AND';
// Check if value has a operator and remove it if it's a number
if (preg_match('/^(!?=|[<>]=?|<>|!)([^=!<>].*)*$/', $value, $matches) > 0) {
if (preg_match('/^(!?=|[<>]=?|<>|!|\|)([^=!<>].*)*$/', $value, $matches) > 0) {
$operator = $matches[1];
$value = ($matches[2] ?? '');
}
@@ -187,15 +186,23 @@ class Conductor
break;
case '>':
case '<':
case '|':
$operator = '=';
$separatorPos = strpos($value, '|');
if ($separatorPos !== false) {
$valueList = explode('|', $value);
foreach($valueList as $valueItem) {
$this->appendFilter($field, $operator, $valueItem, 'OR');
}
continue 2;
}
break;
case '>=':
case '<=':
case '!=':
break;
case '<>':
$separatorPos = strpos($value, '|');
if ($separatorPos === false) {
$operator = '!=';
}
$operator = '!=';
break;
default:
$operator = 'LIKE';