tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix events acknowledge-by

Browse Source
This commit is contained in:
daniel 2020-10-30 14:42:10 +01:00 committed by Daniel Rodriguez
parent 0fad0d7f01
commit c4e7c6b5f1
3 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pandora_console/include/ajax/events.php
View File

@ -1147,12 +1147,37 @@ if ($change_status) {
$event_ids = get_parameter('event_ids'); $event_ids = get_parameter('event_ids');
$new_status = get_parameter('new_status'); $new_status = get_parameter('new_status');
$return = events_change_status(explode(',', $event_ids), $new_status, $meta, $history); $return = events_change_status(
explode(',', $event_ids),
$new_status,
$meta,
$history
);
if ($return) { if ($return !== false) {
echo 'status_ok'; echo json_encode(
[
'status' => 'status_ok',
'user' => db_get_value(
'fullname',
'tusuario',
'id_user',
$config['id_user']
),
]
);
} else { } else {
echo 'status_error'; echo json_encode(
[
'status' => 'status_error',
'user' => db_get_value(
'fullname',
'tusuario',
'id_user',
$config['id_user']
),
]
);
} }
return; return;

14
pandora_console/include/functions_events.php
View File

@ -4701,16 +4701,24 @@ function events_page_general($event)
$table_general->data[] = $data; $table_general->data[] = $data;
// If event is validated, show who and when acknowleded it. // If event is validated, show who and when acknowleded it.
$table_general->cellclass[8][1] = 'general_acknowleded';
$data = []; $data = [];
$data[0] = __('Acknowledged by'); $data[0] = __('Acknowledged by');
if ($event['estado'] == 1) { if ($event['estado'] == 1) {
$user_ack = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']); $user_ack = db_get_value(
if (empty($user_ack)) { 'fullname',
'tusuario',
'id_user',
$event['id_usuario']
);
if (empty($user_ack) === true) {
$user_ack = $event['id_usuario']; $user_ack = $event['id_usuario'];
} }
$date_ack = date($config['date_format'], $event['ack_utimestamp']); $date_ack = io_safe_output($event['ack_utimestamp']);
$data[1] = $user_ack.' ('.$date_ack.')'; $data[1] = $user_ack.' ('.$date_ack.')';
} else { } else {
$data[1] = '<i>'.__('N/A').'</i>'; $data[1] = '<i>'.__('N/A').'</i>';

15
pandora_console/include/javascript/pandora_events.js
View File

@ -453,7 +453,6 @@ function perform_response_massive(response, response_id, out_iterator) {
// Change the status of an event to new, in process or validated. // Change the status of an event to new, in process or validated.
function event_change_status(event_ids) { function event_change_status(event_ids) {
var new_status = $("#estado").val(); var new_status = $("#estado").val();
var event_id = $("#hidden-id_event").val();
var meta = $("#hidden-meta").val(); var meta = $("#hidden-meta").val();
var history = $("#hidden-history").val(); var history = $("#hidden-history").val();
@ -472,7 +471,7 @@ function event_change_status(event_ids) {
type: "POST", type: "POST",
url: $("#hidden-ajax_file").val(), url: $("#hidden-ajax_file").val(),
async: true, async: true,
dataType: "html", dataType: "json",
success: function(data) { success: function(data) {
$("#button-status_button").removeAttr("disabled"); $("#button-status_button").removeAttr("disabled");
$("#response_loading").hide(); $("#response_loading").hide();
@ -485,11 +484,20 @@ function event_change_status(event_ids) {
$("#notification_status_error").hide(); $("#notification_status_error").hide();
} }
if (data == "status_ok") { if (data.status == "status_ok") {
if (typeof dt_events !== "undefined") { if (typeof dt_events !== "undefined") {
dt_events.draw(false); dt_events.draw(false);
} }
$("#notification_status_success").show(); $("#notification_status_success").show();
if (new_status == 1) {
$("#extended_event_general_page table td.general_acknowleded").text(
data.user
);
} else {
$("#extended_event_general_page table td.general_acknowleded").text(
"N/A"
);
}
} else { } else {
$("#notification_status_error").show(); $("#notification_status_error").show();
} }
@ -942,7 +950,6 @@ function execute_event_response(event_list_btn) {
}); });
break; break;
case "delete_selected": case "delete_selected":
console.log($(this));
$(".chk_val:checked").each(function() { $(".chk_val:checked").each(function() {
execute_delete_event_reponse( execute_delete_event_reponse(
dt_events, dt_events,