Merge branch 'cherry-pick-256e81d0' into 'pandora_6.0'

Merge branch '2-el-campo-last-data-hacer-click-en-un-modulo-no-se-muestra-correc…

See merge request !5
This commit is contained in:
vgilc 2017-01-23 16:14:03 +01:00
commit 7235945bd5

View File

@ -199,16 +199,18 @@ function treeview_printModuleTable($id_module, $server_data = false, $no_head =
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
GENERIC_SIZE_TEXT, true, true,
true, '...', 'white-space: nowrap;');
break;
default:
if (is_numeric($last_data["datos"]))
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
GENERIC_SIZE_TEXT, true, true,
true, '...', 'white-space: nowrap;');
break;
}
break;
@ -226,16 +228,18 @@ function treeview_printModuleTable($id_module, $server_data = false, $no_head =
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
GENERIC_SIZE_TEXT, true, true, true,
'...', 'white-space: nowrap;');
break;
default:
if (is_numeric($last_data["datos"]))
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
GENERIC_SIZE_TEXT, true, true, true,
'...', 'white-space: nowrap;');
break;
}
}