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-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Pablo Aragon 2023-03-09 17:21:29 +01:00
parent d3ed5a93fc d4fa2831bf
commit 188ad07be0
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -476,11 +476,6 @@ if ($id_agente) {
$inventorytab['active'] = false;
}
$inventorytab = enterprise_hook('inventory_tab');
if ($inventorytab === ENTERPRISE_NOT_HOOK) {
$inventorytab = '';
}
$has_remote_conf = enterprise_hook(
'config_agents_has_remote_configuration',
[$id_agente]

4
pandora_console/include/functions_reporting.php
View File

@ -2618,6 +2618,10 @@ function reporting_agents_inventory($report, $content)
$es_agents_inventory_display_options = [];
}
if ($es_agent_custom_fields === '') {
$es_agent_custom_fields = [];
}
$custom_field_sql = '';
$search_sql = '';

4
pandora_console/include/functions_reporting_html.php
View File

@ -4643,7 +4643,7 @@ function reporting_html_availability_graph($table, $item, $pdf=0)
$table1->data[$k_chart][0] .= ' (24 x 7)';
}
$total_values += $sla_value;
$total_values .= $sla_value;
$count_total_charts++;
$table1->data[$k_chart][1] = $chart['chart'];
$table1->data[$k_chart][2] = "<span style = 'font-weight: bold; font-size: ".$font_size.'; color: '.$color."'>".$sla_value.'</span><br/>';
@ -4720,7 +4720,7 @@ function reporting_html_availability_graph($table, $item, $pdf=0)
case 'result':
default:
$total_values += $sla_value;
$total_values .= $sla_value;
$count_total_charts++;
$title = '<b>'.__('Result').'</b>';
$sla_value_text = "<span style = 'font-weight: bold; font-size: ".$font_size.(($pdf === 0) ? ' !important' : '').'; color: '.$color."'>".$sla_value.'</span>';

1
pandora_console/include/functions_ui.php
View File

@ -727,6 +727,7 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
}
}
$icon = (str_contains($icon, '.svg') === true) ? $icon : $icon.'.svg';
$output .= html_print_image(
'images/'.$icon,
true,

3
pandora_console/include/styles/pandora.css
View File

@ -8141,7 +8141,8 @@ div.graph div.legend table {
min-height: 460px;
position: relative;
overflow: hidden;
background-color: #fafafa;
background-color: var(--secondary-color);
min-height: calc(100vh - 200px);
}
/*