From 2ad4e2bd33d5be50ef49a10afedc05aee21f42b6 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 16 Feb 2012 14:16:26 +0000 Subject: [PATCH] 2012-02-16 Sergio Martin * operation/events/events.php: Fixed disable alerts in event validation when choose more than one event to validate git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5615 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/operation/events/events.php | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 63e4d15a87..37ec2dd973 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-02-16 Sergio Martin + + * operation/events/events.php: Fixed disable alerts in + event validation when choose more than one event to validate + 2012-02-16 Vanessa Gil * operation/events/events_list: Changed user name to event list. diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 83e2db5e3f..c17a7985e7 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -280,7 +280,8 @@ if ($validate) { $comment = get_parameter ("comment", ''); $new_status = get_parameter ("select_validate", 1); $ids = explode(',',$ids); - + $standby_alert = (bool) get_parameter("standby-alert"); + // Avoid to re-set inprocess events if($new_status == 2) { foreach($ids as $key => $id) { @@ -290,6 +291,7 @@ if ($validate) { } } } + if(isset($ids[0]) && $ids[0] != -1){ $return = events_validate_event ($ids, ($group_rep == 1), $comment, $new_status); if($new_status == 1) { @@ -303,6 +305,15 @@ if ($validate) { __('Could not be set in process')); } } + + if ($standby_alert) { + foreach($ids as $id) { + $event = events_get_event ($id); + if ($event !== false) { + alerts_agent_module_standby ($event['id_alert_am'], 1); + } + } + } } //Process deletion (pass array or single value)