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

Merge branch 'ent-9279-doble-refresco-en-vista-de-eventos-de-metaconsola-al-tener-autorrefresco-activado' into 'develop' 

double refresh page events pandora_enterprise#9279

pandora_enterprise#9279

See merge request artica/pandorafms!5021
This commit is contained in:
Jimmy Olano 2022-07-21 01:36:33 +00:00
parent b76dc9d062 84fbf0e3dd
commit 673798a43e
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/general/header.php
View File

@ -925,7 +925,9 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
layout: '%M%nn%M:%S%nn%S', layout: '%M%nn%M:%S%nn%S',
labels: ['', '', '', '', '', '', ''], labels: ['', '', '', '', '', '', ''],
onExpiry: function () { onExpiry: function () {
dt_events.draw(false); $("#table_events")
.DataTable()
.draw(false);
} }
}); });
} }

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

@ -482,21 +482,23 @@ if (is_ajax() === true) {
$tmp->b64 = base64_encode(json_encode($tmp)); $tmp->b64 = base64_encode(json_encode($tmp));
// Show comments events. // Show comments events.
$tmp->user_comment = $tmp->comments; if (empty($tmp->comments) === false) {
if ($tmp->comments !== 'undefined' && strlen($tmp->comments) > 80) { $tmp->user_comment = $tmp->comments;
$tmp->user_comment .= '&nbsp;&nbsp;'; if ($tmp->comments !== 'undefined' && strlen($tmp->comments) > 80) {
$tmp->user_comment .= '<a id="show_comments" href="javascript:" onclick="show_event_dialog(\''; $tmp->user_comment .= '&nbsp;&nbsp;';
$tmp->user_comment .= $tmp->b64; $tmp->user_comment .= '<a id="show_comments" href="javascript:" onclick="show_event_dialog(\'';
$tmp->user_comment .= '\',\'comments\')>;'; $tmp->user_comment .= $tmp->b64;
$tmp->user_comment .= html_print_image( $tmp->user_comment .= '\',\'comments\')>;';
'images/operation.png', $tmp->user_comment .= html_print_image(
true, 'images/operation.png',
[ true,
'title' => __('Show more'), [
'class' => 'invert_filter', 'title' => __('Show more'),
] 'class' => 'invert_filter',
); ]
$tmp->user_comment .= '</a>'; );
$tmp->user_comment .= '</a>';
}
} }
// Grouped events. // Grouped events.