tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-05-16 Vanessa Gil <vanessa.gil@artica.es> 

* 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
This commit is contained in:
vgilc 2011-05-16 11:33:06 +00:00
parent af68f38a34
commit dae5b04ec7
3 changed files with 11 additions and 1 deletions
pandora_console
ChangeLog
godmode/alerts
alert_list.list.php
include
functions_alerts.php

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-05-16 Vanessa Gil <vanessa.gil@artica.es>
* 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 <miguel.dedios@artica.es>
* operation/agentes/status_monitor.php: changed the source code to extract

3
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -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] .= ')</em>';
$data[6] .= '</font>';
// $data[6] .= ' <span class="delete" style="clear:right">';

3
pandora_console/include/functions_alerts.php
View File

@ -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;
}