From f253ea561a7a869c23ce16bc8369e92c2afaae0b Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Thu, 19 May 2022 10:14:41 +0200 Subject: [PATCH] fixed query filter --- .../godmode/reporting/reporting_builder.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 608f2f6a54..7073ce1702 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/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