kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-15 10:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Fixed API equals/not equals filter comparison (fixes #1182)

Browse Source
This commit is contained in:
Bernd Bestel
2020-12-16 21:52:24 +01:00
parent 13b18ef410
commit bb6ef5511d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/BaseApiController.php
View File

@@ -93,17 +93,18 @@ class BaseApiController extends BaseController
throw new \Exception('Invalid query'); throw new \Exception('Invalid query');
} }
$sqlOrNull = '';
if (strtolower($matches['value']) == 'null') if (strtolower($matches['value']) == 'null')
{ {
$matches['value'] = ''; $sqlOrNull = ' OR ' . $matches['field'] . ' IS NULL';
} }
switch ($matches['op']) { switch ($matches['op']) {
case '=': case '=':
$data = $data->where('IFNULL(' . $matches['field'] . ', \'\') = ?', $matches['value']); $data = $data->where($matches['field'] . ' = ?' . $sqlOrNull, $matches['value']);
break; break;
case '!=': case '!=':
$data = $data->where('IFNULL(' . $matches['field'] . ', \'\') != ?', $matches['value']); $data = $data->where($matches['field'] . ' != ?' . $sqlOrNull, $matches['value']);
break; break;
case '~': case '~':
$data = $data->where($matches['field'] . ' LIKE ?', '%' . $matches['value'] . '%'); $data = $data->where($matches['field'] . ' LIKE ?', '%' . $matches['value'] . '%');