From 243c298ff8294ddf44546cb321b0bb0bf0c1e41e Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 29 Jul 2019 08:59:56 +0200 Subject: [PATCH 1/3] Added text control to avoid show more of 255 chars in his field --- pandora_console/operation/events/events.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index b316bea7ff..771dfa62aa 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -278,7 +278,12 @@ if (is_ajax()) { $events, function ($carry, $item) { $tmp = (object) $item; - $tmp->evento = io_safe_output($tmp->evento); + if (strlen($tmp->evento) >= 255) { + $tmp->evento = io_safe_output(substr($tmp->evento, 0, 253).'...)'); + } else { + $tmp->evento = io_safe_output($tmp->evento); + } + if ($tmp->module_name) { $tmp->module_name = io_safe_output($tmp->module_name); } From 6ca2caa5119982b4cf582b4351894cfef944a032 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 6 Aug 2019 11:06:11 +0200 Subject: [PATCH 2/3] Added hint and solved other issues when events has a lot of characters --- pandora_console/operation/events/events.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 771dfa62aa..bb5235b3b5 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -278,8 +278,13 @@ if (is_ajax()) { $events, function ($carry, $item) { $tmp = (object) $item; + $tmp->hint = ''; if (strlen($tmp->evento) >= 255) { - $tmp->evento = io_safe_output(substr($tmp->evento, 0, 253).'...)'); + $tmp->hint = io_safe_output(chunk_split(substr($tmp->evento, 0, 600), 80, '
').'(...)'); + $tmp->evento = io_safe_output(substr($tmp->evento, 0, 253).'(...)'); + if (strpos($tmp->evento, ' ') === false) { + $tmp->evento = substr($tmp->evento, 0, 80).'(...)'; + } } else { $tmp->evento = io_safe_output($tmp->evento); } @@ -1636,6 +1641,9 @@ function process_datatables_item(item) { evn += '('+item.event_rep+') '; } evn += item.evento+''; + if(item.hint !== ''){ + evn += ' '+item.hint+''; + } item.mini_severity = '
'; item.mini_severity += output; From 191db192c9244a7e91d56e693adbeebf6376b129 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 7 Aug 2019 14:14:14 +0200 Subject: [PATCH 3/3] Solved issue with metaconsole --- pandora_console/operation/events/events.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index bb5235b3b5..12a47f9784 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -279,8 +279,10 @@ if (is_ajax()) { function ($carry, $item) { $tmp = (object) $item; $tmp->hint = ''; + $tmp->meta = false; if (strlen($tmp->evento) >= 255) { $tmp->hint = io_safe_output(chunk_split(substr($tmp->evento, 0, 600), 80, '
').'(...)'); + $tmp->meta = is_metaconsole(); $tmp->evento = io_safe_output(substr($tmp->evento, 0, 253).'(...)'); if (strpos($tmp->evento, ' ') === false) { $tmp->evento = substr($tmp->evento, 0, 80).'(...)'; @@ -1642,7 +1644,8 @@ function process_datatables_item(item) { } evn += item.evento+''; if(item.hint !== ''){ - evn += ' '+item.hint+''; + let ruta = item.meta == true ? '../../images/tip_help.png' : 'images/tip_help.png'; + evn += ' '+item.hint+''; } item.mini_severity = '
';