Merge branch '20-codificacion-de-nombre-en-el-tree-view-malas' into 'develop'

fixed errors in tree-view

See merge request !52
This commit is contained in:
daniel 2017-01-19 12:46:23 +01:00
parent 84e3f695ff
commit 5b41ebebe4
2 changed files with 3 additions and 3 deletions

View File

@ -1435,7 +1435,7 @@ class Tree {
$module['type'] = 'module';
$module['id'] = (int) $module['id'];
$module['name'] = $module['name'];
$module['name'] = io_safe_output($module['name']);
$module['id_module_type'] = (int) $module['id_tipo_modulo'];
$module['server_type'] = (int) $module['id_modulo'];
$module['status'] = $module['estado'];

View File

@ -71,9 +71,9 @@ function treeview_printModuleTable($id_module, $server_data = false, $no_head =
//Module name
if ($module["disabled"])
$cellName = "<em>" . ui_print_truncate_text ($module["nombre"], GENERIC_SIZE_TEXT, true, true, true, '[&hellip;]',"text-transform: uppercase;") . ui_print_help_tip(__('Disabled'), true) . "<em>";
$cellName = "<em>" . ui_print_truncate_text (io_safe_output($module["nombre"]), GENERIC_SIZE_TEXT, true, true, true, '[&hellip;]',"text-transform: uppercase;") . ui_print_help_tip(__('Disabled'), true) . "<em>";
else
$cellName = ui_print_truncate_text ($module["nombre"], GENERIC_SIZE_TEXT, true, true, true, '[&hellip;]',"text-transform: uppercase;");
$cellName = ui_print_truncate_text (io_safe_output($module["nombre"]), GENERIC_SIZE_TEXT, true, true, true, '[&hellip;]',"text-transform: uppercase;");
$row = array();
$row['title'] = __('Name');