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

fix show comment events ticket pandora_enterprise#12066

This commit is contained in:
daniel 2023-09-22 12:56:01 +02:00
parent 1ffebcf49c
commit c6a04d5d8f
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ function show_event_dialog(event, dialog_page) {
.empty()
.append(data)
.dialog({
title: event.evento,
title: event.event_title,
resizable: true,
draggable: true,
modal: false,

13
pandora_console/operation/events/events.php
View File

@ -511,8 +511,10 @@ if (is_ajax() === true) {
);
}
$tmp->evento = str_replace('"', '', io_safe_output($tmp->evento));
$event_text = $tmp->evento;
$output_event_name = str_replace('"', '', io_safe_output($tmp->evento));
$tmp->event_title = $output_event_name;
$tmp->b64 = base64_encode(json_encode($tmp));
$tmp->evento = $output_event_name;
$tmp->evento = ui_print_truncate_text(
$tmp->evento,
@ -623,7 +625,7 @@ if (is_ajax() === true) {
$total_sec = strtotime($tmp->timestamp);
$total_sec += $dif;
$last_contact = date($confb64ig['date_format'], $total_sec);
$last_contact = date($config['date_format'], $total_sec);
$last_contact_value = ui_print_timestamp($last_contact, true);
} else {
$title = date($config['date_format'], strtotime($tmp->timestamp));
@ -662,11 +664,6 @@ if (is_ajax() === true) {
);
}
$aux_event = $tmp->evento;
$tmp->evento = $event_text;
$tmp->b64 = base64_encode(json_encode($tmp));
$tmp->evento = $aux_event;
$tmp->user_comment = ui_print_comments(
event_get_last_comment(
$item,