From dae5b04ec706a8be3965f7af9b09f9bb69970230 Mon Sep 17 00:00:00 2001 From: vgilc Date: Mon, 16 May 2011 11:33:06 +0000 Subject: [PATCH] 2011-05-16 Vanessa Gil * godmode/alerts/alert_list_list.php include/ functions_alerts.php: Fixed bug: Display the action threshold when displaying actions in the agent alert views. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4355 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/godmode/alerts/alert_list.list.php | 3 +++ pandora_console/include/functions_alerts.php | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 271cced99a..ff52fc2a71 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2011-05-16 Vanessa Gil + + * godmode/alerts/alert_list_list.php + include/ functions_alerts.php: Fixed bug: Display the action threshold when displaying actions in the agent alert views. + + 2011-05-16 Miguel de Dios * operation/agentes/status_monitor.php: changed the source code to extract diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 6e0f97798e..29ace618ad 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -481,6 +481,9 @@ foreach ($simple_alerts as $alert) { $data[6] .= __('From').' '.$action['fires_min']. ' '.__('to').' '.$action['fires_max']; } + if ($action['module_action_threshold'] != 0) + $data[6] .= ' '.__('Threshold').' '.$action['module_action_threshold']; + $data[6] .= ')'; $data[6] .= ''; // $data[6] .= ' '; diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php index 8d82f7d871..551f43e018 100644 --- a/pandora_console/include/functions_alerts.php +++ b/pandora_console/include/functions_alerts.php @@ -1069,7 +1069,7 @@ function alerts_get_alert_agent_module_actions ($id_alert_agent_module, $fields array ('id_alert_compound' => $id_alert_agent_module), $fields); } - else { + else { $actions = db_get_all_rows_filter ('talert_template_module_actions', array ('id_alert_template_module' => $id_alert_agent_module), $fields); @@ -1084,6 +1084,7 @@ function alerts_get_alert_agent_module_actions ($id_alert_agent_module, $fields $action = alerts_get_alert_action ($element['id_alert_action']); $action['fires_min'] = $element['fires_min']; $action['fires_max'] = $element['fires_max']; + $action['module_action_threshold'] = $element['module_action_threshold']; if (isset($element['id'])) $retval[$element['id']] = $action; }