From 99370fa18a4541d5d7ee72e3452cb0e6915b29a3 Mon Sep 17 00:00:00 2001 From: vgilc Date: Mon, 16 Jan 2012 14:24:20 +0000 Subject: [PATCH] 2012-01-16 Vanessa Gil * operation/agentes/estado_monitores.php: Fixed bug: count in the group mode is not well done because ignore the disabled modules. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5372 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/operation/agentes/estado_monitores.php | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 020fe6c132..3a27066b7a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-01-16 Vanessa Gil + + * operation/agentes/estado_monitores.php: Fixed bug: count in the group + mode is not well done because ignore the disabled modules. + 2012-01-16 Vanessa Gil * godmode/netflow/nf_edit.php diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index a6d605f1e6..d62bd681a9 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -178,7 +178,7 @@ switch ($config["dbtype"]) { ORDER BY tagente_modulo.id_module_group , %s %s ", $id_agente, $order['field'], $order['order']); */ $sql = sprintf(" - SELECT * FROM tagente_estado, (SELECT * FROM tagente_modulo WHERE id_agente = %d AND disabled = 0 AND delete_pending = 0) tagente_modulo + SELECT * FROM tagente_estado, (SELECT * FROM tagente_modulo WHERE id_agente = %d AND delete_pending = 0) tagente_modulo LEFT JOIN tmodule_group ON tagente_modulo.id_module_group = tmodule_group.id_mg WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND %s tagente_estado.utimestamp != 0 @@ -197,7 +197,6 @@ switch ($config["dbtype"]) { ON tmodule_group.id_mg = tagente_modulo.id_module_group WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.id_agente = %d - AND tagente_modulo.disabled = 0 AND tagente_modulo.delete_pending = 0 AND tagente_estado.utimestamp != 0 ORDER BY tagente_modulo.id_module_group , %s %s