From e6f387f5d0285c19701fb3b4af49ab1d053329a0 Mon Sep 17 00:00:00 2001 From: javilanz Date: Mon, 29 Aug 2011 16:15:19 +0000 Subject: [PATCH] 2011-08-29 Javier Lanz * operation/agentes/ver_agente.php: Fixed a bug filling modules combo Fixes: #3397520 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4842 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/operation/agentes/ver_agente.php | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ef7a8f6c3e..3cb35e2dc2 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2011-08-29 Javier Lanz + + * operation/agentes/ver_agente.php: Fixed a bug filling modules combo + + Fixes: #3397520 + 2011-08-29 Sergio Martin * images/attachment_del.png: Added new icon to policy queue diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 3d5325d9f5..a00d70b2f3 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -111,12 +111,14 @@ if (is_ajax ()) { FROM tagente_modulo t1, talert_template_modules t2 WHERE t2.id_agent_module = t1.id_agente_modulo AND delete_pending = 0 + AND id_alert_template = '.$id_template.' AND id_agente IN (' . implode(',', $idAgents) . ') AND ( SELECT count(nombre) FROM tagente_modulo t3, talert_template_modules t4 WHERE t4.id_agent_module = t3.id_agente_modulo AND delete_pending = 0 AND t1.nombre = t3.nombre - AND id_agente IN (' . implode(',', $idAgents) . ')) = (' . count($idAgents) . ')'); + AND id_agente IN (' . implode(',', $idAgents) . ') + AND id_alert_template = '.$id_template.') = (' . count($idAgents) . ')'); if ($nameModules == false) { $nameModules = array();