#9787 Alert general Acknowledged recovery
This commit is contained in:
parent
a54599caba
commit
e55d4f3019
|
@ -59,6 +59,7 @@ $drawConsoleSound = (bool) get_parameter('drawConsoleSound', false);
|
|||
$process_buffers = (bool) get_parameter('process_buffers', false);
|
||||
$get_extended_event = (bool) get_parameter('get_extended_event');
|
||||
$change_status = (bool) get_parameter('change_status');
|
||||
$get_Acknowledged = (bool) get_parameter('get_Acknowledged');
|
||||
$change_owner = (bool) get_parameter('change_owner');
|
||||
$add_comment = (bool) get_parameter('add_comment');
|
||||
$dialogue_event_response = (bool) get_parameter('dialogue_event_response');
|
||||
|
@ -1513,6 +1514,12 @@ if ($change_status === true) {
|
|||
return;
|
||||
}
|
||||
|
||||
if ($get_Acknowledged === true) {
|
||||
$event_id = get_parameter('event_id');
|
||||
echo events_page_general_acknowledged($event_id);
|
||||
return;
|
||||
}
|
||||
|
||||
if ($change_owner === true) {
|
||||
$new_owner = get_parameter('new_owner', '');
|
||||
$event_id = (int) get_parameter('event_id', 0);
|
||||
|
|
|
@ -4921,12 +4921,46 @@ function events_page_general($event)
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return Acknowledged by value
|
||||
*
|
||||
* @param integer $event_id Event_id to return Acknowledged.
|
||||
*
|
||||
* @return string String with user and date.
|
||||
*/
|
||||
function events_page_general_acknowledged($event_id)
|
||||
{
|
||||
global $config;
|
||||
$Acknowledged = '';
|
||||
$event = db_get_all_rows_filter('tevento', 'id_evento', $event_id);
|
||||
|
||||
if ($event) {
|
||||
$user_ack = db_get_value(
|
||||
'fullname',
|
||||
'tusuario',
|
||||
'id_user',
|
||||
$config['id_user']
|
||||
);
|
||||
|
||||
if (empty($user_ack) === true) {
|
||||
$user_ack = $config['id_user'];
|
||||
}
|
||||
|
||||
$Acknowledged = $user_ack.' ( '.date($config['date_format'], $event['ack_utimestamp_raw']).' ) ';
|
||||
} else {
|
||||
$Acknowledged = 'N/A';
|
||||
}
|
||||
|
||||
return $Acknowledged;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Generate 'comments' page for event viewer.
|
||||
*
|
||||
* @param array $event Event.
|
||||
* @param boolean $ajax If the query come from AJAX.
|
||||
* @param boolean $grouped If the event must shown comments grouped.
|
||||
* @param array $event Event.
|
||||
* @param boolean $ajax If the query come from AJAX.
|
||||
* @param boolean $groupedComments If the event must shown comments grouped.
|
||||
*
|
||||
* @return string HTML.
|
||||
*/
|
||||
|
|
|
@ -339,6 +339,19 @@ function event_change_status(event_ids, server_id) {
|
|||
// if (typeof dt_events !== "undefined") {
|
||||
// dt_events.draw(false);
|
||||
// }
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "ajax.php",
|
||||
data: {
|
||||
page: "include/ajax/events",
|
||||
get_Acknowledged: 1,
|
||||
event_id: event_ids
|
||||
},
|
||||
success: function(response) {
|
||||
$("#table4-9-1").html(response);
|
||||
}
|
||||
});
|
||||
|
||||
$("#table_events")
|
||||
.DataTable()
|
||||
.draw(false);
|
||||
|
|
Loading…
Reference in New Issue