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-12515-bug-al-mostrar-el-evento-completo-en-un-tooltip-en-la-vista-de-eventos' into 'develop' 

Ent 12515 bug al mostrar el evento completo en un tooltip en la vista de eventos

See merge request artica/pandorafms!6787
This commit is contained in:
Matias Didier 2024-01-22 09:30:08 +00:00
parent f35b95f0fe 8a9fbbac8b
commit b38d50a3b2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/functions_ui.php
View File

@ -96,7 +96,8 @@ function ui_print_truncate_text(
$showTextInTitle=true, $showTextInTitle=true,
$suffix='…', $suffix='…',
$style=false, $style=false,
$forced_title=false $forced_title=false,
$text_title=''
) { ) {
global $config; global $config;
$truncate_at_end = false; $truncate_at_end = false;
@ -211,7 +212,11 @@ function ui_print_truncate_text(
} }
if ($forced_title === true) { if ($forced_title === true) {
$truncateText = '<span class="forced_title" style="'.$style.'" data-title="'.$text.'" data-use_title_for_force_title="1>'.$truncateText.'</span>'; if ($text_title !== '') {
$truncateText = '<span class="forced_title" style="'.$style.'" data-title="'.$text_title.'" data-use_title_for_force_title="1">'.$truncateText.'</span>';
} else {
$truncateText = '<span class="forced_title" style="'.$style.'" data-title="'.$text.'" data-use_title_for_force_title="1">'.$truncateText.'</span>';
}
} }
if ($return == true) { if ($return == true) {

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

@ -522,6 +522,7 @@ if (is_ajax() === true) {
$tmp->event_title = $output_event_name; $tmp->event_title = $output_event_name;
$tmp->b64 = base64_encode(json_encode($tmp)); $tmp->b64 = base64_encode(json_encode($tmp));
$tmp->evento = $output_event_name; $tmp->evento = $output_event_name;
$tmp->event_force_title = (strlen($output_event_name) >= 300) ? substr($output_event_name, 0, 300).'...' : $output_event_name;
if (empty($tmp->module_name) === false) { if (empty($tmp->module_name) === false) {
$tmp->module_name = ui_print_truncate_text( $tmp->module_name = ui_print_truncate_text(
@ -768,6 +769,7 @@ if (is_ajax() === true) {
'&hellip;', '&hellip;',
true, true,
true, true,
$tmp->event_force_title
); );
$evn .= $tmp->evento.'</a>'; $evn .= $tmp->evento.'</a>';