From 5e3116ac7991008976c41fa71156640475b01167 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Fri, 17 Jan 2014 12:59:00 +0000 Subject: [PATCH] 2014-01-17 Juan Manuel Ramon Vigo * godmode/reporting/reporting_builder.php: Fixed group filter in report list view git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ .../godmode/reporting/reporting_builder.php | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7bc785b727..8520a2f171 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2014-01-17 Juan Manuel Ramon Vigo + + * godmode/reporting/reporting_builder.php: Fixed group filter in report + list view. + 2014-01-17 Miguel de Dios * godmode/agentes/agent_manager.php: fixed the PHP warnings and diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 9ed08a4006..8756816b29 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -336,6 +336,17 @@ switch ($action) { 'order' => 'name' ); } + + # Fix : group filter was not working + // Show only selected groups + if ($id_group > 0) { + $group = array("$id_group" => $id_group); + $filter['id_group'] = $id_group; + } + else { + $group = false; + } + // Filter normal and metaconsole reports if ($config['metaconsole'] == 1 and defined('METACONSOLE')) @@ -346,6 +357,7 @@ switch ($action) { $reports = reports_get_reports ($filter, array ('name', 'id_report', 'description', 'private', 'id_user', 'id_group'), $return_all_group, 'RR', $group); + $table->width = '0px'; if (sizeof ($reports)) { $table->id = 'report_list';