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-4726-truncado-eventos-texto-muy-largo' into 'develop' 

Improved truncate system and solved issue

See merge request artica/pandorafms!2774
This commit is contained in:
Daniel Rodriguez 2019-10-07 13:49:57 +02:00
parent cb6b48aa3f 7ac12e45ef
commit debbbdc4e5
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_events.php
View File

@ -4382,7 +4382,7 @@ function events_page_general($event)
$data = [];
$data[0] = __('Event name');
$data[1] = events_display_name($event['evento']);
$data[1] = '<span style="word-break: break-word;">'.events_display_name($event['evento']).'</span>';
$table_general->data[] = $data;
$data = [];

4
pandora_console/include/functions_ui.php
View File

@ -162,6 +162,10 @@ function ui_print_truncate_text($text, $numChars=GENERIC_SIZE_TEXT, $showTextInA
}
if ($showTextInAToopTip) {
if (is_string($showTextInAToopTip)) {
$text = ui_print_truncate_text($showTextInAToopTip, ($numChars * 2), false, true, false);
}
$truncateText = $truncateText.ui_print_help_tip(htmlspecialchars($text), true);
} else {
if ($style !== false) {

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

@ -280,17 +280,9 @@ if (is_ajax()) {
$events,
function ($carry, $item) {
$tmp = (object) $item;
$tmp->hint = '';
$tmp->meta = false;
$tmp->evento = str_replace('"', '', io_safe_output($tmp->evento));
if (strlen($tmp->evento) >= 255) {
$tmp->hint = io_safe_output(chunk_split(substr($tmp->evento, 0, 600), 80, '<br>').'(...)');
$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).'(...)';
}
} else {
$tmp->evento = io_safe_output($tmp->evento);
$tmp->evento = ui_print_truncate_text($tmp->evento, 255, $tmp->evento, true, false);
}
if ($tmp->module_name) {
@ -1661,10 +1653,6 @@ function process_datatables_item(item) {
evn += '('+item.event_rep+') ';
}
evn += item.evento+'</a>';
if(item.hint !== ''){
let ruta = item.meta == true ? '../../images/tip_help.png' : 'images/tip_help.png';
evn += '&nbsp;<img src="'+ruta+'" data-title="'+item.hint+'" data-use_title_for_force_title="1" class="forced_title" alt="'+item.hint+'">';
}
item.mini_severity = '<div class="event flex-row h100p nowrap">';
item.mini_severity += output;