Skip to content

fix(searchOption): notequals operator returns equals values for multiple dropdown #928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 20, 2025
Merged

fix(searchOption): notequals operator returns equals values for multiple dropdown #928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c88f59a
fix(searchOption): notequals operator returns equals values for multi…
MyvTsv Mar 13, 2025
2d26a09
fix notequals
MyvTsv Mar 13, 2025
0219d64
Update hook.php
MyvTsv Mar 14, 2025
9fedbce
verif not condition
MyvTsv Mar 14, 2025
1d47324
lint
MyvTsv Mar 14, 2025
77a50b7
Update CHANGELOG.md
MyvTsv Mar 14, 2025
00660d5
Update CHANGELOG.md
MyvTsv Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed

- Fix container update from other context (like plugins)
- Fix "not equals" search operator for dropdown `multiple`

## [1.21.19] - 2025-02-03

Expand Down
19 changes: 14 additions & 5 deletions hook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,6 @@ function plugin_datainjection_populate_fields()

function plugin_fields_addWhere($link, $nott, $itemtype, $ID, $val, $searchtype)
{
/** @var \DBmysql $DB */
global $DB;

$searchopt = &Search::getOptions($itemtype);
$table = $searchopt[$ID]['table'];
$field = $searchopt[$ID]['field'];
Expand All @@ -357,12 +354,19 @@ function plugin_fields_addWhere($link, $nott, $itemtype, $ID, $val, $searchtype)
],
)
) {
return $link . $DB->quoteName("$table" . '_' . "$field") . '.' . $DB->quoteName($field) . 'LIKE ' . $DB->quoteValue("%\"$val\"%") ;
$tablefield = "$table" . '_' . "$field";
switch ($searchtype) {
case 'equals':
return PluginFieldsDropdown::multipleDropdownAddWhere($link, $tablefield, $field, $val, $nott ? 'notequals' : 'equals');
case 'notequals':
return PluginFieldsDropdown::multipleDropdownAddWhere($link, $tablefield, $field, $val, $nott ? 'equals' : 'notequals');
}
} else {
// if 'multiple' field with cleaned name is found -> 'dropdown' case
// update WHERE clause with LIKE statement
$cleanfield = str_replace('plugin_fields_', '', $field);
$cleanfield = str_replace('dropdowns_id', '', $cleanfield);
$tablefield = "$table" . '_' . "$cleanfield";
if (
$field_field->getFromDBByCrit(
[
Expand All @@ -371,7 +375,12 @@ function plugin_fields_addWhere($link, $nott, $itemtype, $ID, $val, $searchtype)
],
)
) {
return $link . $DB->quoteName("$table" . '_' . "$cleanfield") . '.' . $DB->quoteName($field) . 'LIKE ' . $DB->quoteValue("%\"$val\"%") ;
switch ($searchtype) {
case 'equals':
return PluginFieldsDropdown::multipleDropdownAddWhere($link, $tablefield, $field, $val, $nott ? 'notequals' : 'equals');
case 'notequals':
return PluginFieldsDropdown::multipleDropdownAddWhere($link, $tablefield, $field, $val, $nott ? 'equals' : 'notequals');
}
} else {
return false;
}
Expand Down
13 changes: 13 additions & 0 deletions inc/dropdown.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,4 +254,17 @@ public static function getClassname($system_name)
{
return 'PluginFields' . ucfirst($system_name) . 'Dropdown';
}

public static function multipleDropdownAddWhere($link, $tablefield, $field, $val, $searchtype)
{
/** @var \DBmysql $DB */
global $DB;

switch ($searchtype) {
case 'equals':
return $link . $DB->quoteName($tablefield) . '.' . $DB->quoteName($field) . 'LIKE ' . $DB->quoteValue("%\"$val\"%") ;
case 'notequals':
return $link . $DB->quoteName($tablefield) . '.' . $DB->quoteName($field) . 'NOT LIKE ' . $DB->quoteValue("%\"$val\"%") . ' OR ' . $link . $DB->quoteName($tablefield) . '.' . $DB->quoteName($field) . 'IS NULL ';
}
}
}