tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8588-Diferencias-de-filtrado-en-vistas-similares-de-Pandora' into 'develop'

Browse Source 
fixed query filter

Ref pandora_enterprise#8588

See merge request
This commit is contained in:
Jimmy Olano 2022-06-29 23:54:48 +00:00
commit fb5dd4d557
1 changed files with 7 additions and 9 deletions

16
pandora_console/godmode/reporting/reporting_builder.php

@ -743,8 +743,9 @@ switch ($action) {
$search = trim(get_parameter('search', ''));
$search_sql = '';
if ($search != '') {
$search_name = '%'.$search."%' OR description LIKE '%".$search.'%';
if ($search !== '') {
$search_name = "(name LIKE '%".$search."%' OR description LIKE '%".$search."%')";
}
$table_aux = new stdClass();
@ -830,13 +831,10 @@ switch ($action) {
$return_all_group = false;
}
if ($search != '') {
$filter = [
'name' => $search_name,
'order' => 'name',
];
} else {
$filter = ['order' => 'name'];
$filter = ['order' => 'name'];
if ($search !== '') {
$filter[] = $search_name;
}
// Fix : group filter was not working