From b417342bd79148f627d839ba7571389fe604d510 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 12 Nov 2013 15:04:46 +0000 Subject: [PATCH] 2013-11-12 Sergio Martin * operation/events/events.build_table.php operation/agentes/estado_monitores.php operation/agentes/ver_agente.php: Fixed old link in module name in events list. Incident #369 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9065 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/operation/agentes/estado_monitores.php | 8 +++++++- pandora_console/operation/agentes/ver_agente.php | 3 +++ pandora_console/operation/events/events.build_table.php | 5 +++-- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c912c09ea6..6a4883eaf3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-11-12 Sergio Martin + + * operation/events/events.build_table.php + operation/agentes/estado_monitores.php + operation/agentes/ver_agente.php: Fixed old link in + module name in events list. Incident #369 + 2013-11-12 Vanessa Gil * operation/agentes/alerts_status.php: Fixed bug displaying diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 0b5e4035c2..f3dc7782cb 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -656,6 +656,12 @@ function print_form_filter_monitors($id_agent, $status_filter_monitor = -1, $form_text .= ''; - ui_toggle($form_text, __('Form filter'), __('Form filter')); + $filter_hidden = false; + + if ($status_filter_monitor == -1 && $status_text_monitor == '') { + $filter_hidden = true; + } + + ui_toggle($form_text, __('Form filter'), __('Form filter'), $filter_hidden); } ?> diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index dc805de755..696a3f202f 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -943,8 +943,11 @@ switch ($tab) { break; case "main": require ("estado_generalagente.php"); + echo ""; require ("estado_monitores.php"); + echo ""; require ("alerts_status.php"); + echo ""; require ("status_events.php"); break; case "data_view": diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php index bd8e97d95a..c8dbe36981 100644 --- a/pandora_console/operation/events/events.build_table.php +++ b/pandora_console/operation/events/events.build_table.php @@ -397,8 +397,9 @@ foreach ($result as $event) { } } else { - $data[$i] = '' - . db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $event["id_agentmodule"]).''; + $module_name = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $event["id_agentmodule"]); + $data[$i] = '' + . $module_name . ''; } $table->cellclass[count($table->data)][$i] = $myclass; $i++;