Kimirock/osTicket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6620 from JediKev/issue/choice-selection-field-searches

Browse Source 
Reviewed-By: Peter Rotich <peter@osticket.com>
This commit is contained in:
Peter Rotich
2023-10-24 10:43:23 -05:00
committed by GitHub
parent 736f3e8772 00e22faddc
commit c7657ae536
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/class.dynamic_forms.php
View File

@@ -1917,7 +1917,7 @@ class SelectionField extends FormField {
$name = $name ?: $this->get('name');
$val = $value;
if ($value && is_array($value))
$val = '"?'.implode('("|,|$)|"?', array_keys($value)).'("|,|$)';
$val = '"?(?<![0-9])'.implode('("|,|$)|"?(?<![0-9])', array_keys($value)).'("|,|$)';
switch ($method) {
case '!includes':
return Q::not(array("{$name}__regex" => $val));

2
include/class.forms.php
View File

@@ -2085,7 +2085,7 @@ class ChoiceField extends FormField {
$name = $name ?: $this->get('name');
$val = $value;
if ($value && is_array($value))
$val = '"?'.implode('("|,|$)|"?', array_keys($value)).'("|,|$)';
$val = '"?(?<![0-9])'.implode('("|,|$)|"?(?<![0-9])', array_keys($value)).'("|,|$)';
switch ($method) {
case '!includes':
return Q::not(array("{$name}__regex" => $val));