tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed bug: hide not init agents not working in report item creation

This commit is contained in:
alejandro-campos 2018-09-10 13:01:48 +02:00
parent 6511f67600
commit 3c25125713
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/include/functions_reporting_html.php
View File

@ -381,7 +381,7 @@ function reporting_html_SLA($table, $item, $mini) {
} }
} }
if(isset($item['data'])){ if(!(!isset($item['data']) && $hide_notinit_agent == 1)) {
$table1 = new stdClass(); $table1 = new stdClass();
$table1->width = '99%'; $table1->width = '99%';
@ -471,7 +471,7 @@ function reporting_html_SLA($table, $item, $mini) {
foreach ($item['data'] as $sla) { foreach ($item['data'] as $sla) {
if(isset($sla)){ if(isset($sla)){
$the_first_men_time = get_agent_first_time(io_safe_output($sla['agent'])); $the_first_men_time = get_agent_first_time(io_safe_output($sla['agent']));
if (!$hide_notinit_agent) {
//first_table //first_table
$row = array(); $row = array();
$row[] = $sla['agent']; $row[] = $sla['agent'];
@ -486,6 +486,9 @@ function reporting_html_SLA($table, $item, $mini) {
} }
$row[] = round($sla['sla_limit'], 2) . "%"; $row[] = round($sla['sla_limit'], 2) . "%";
if (!$hide_notinit_agent) {
if (reporting_sla_is_not_init_from_array($sla)) { if (reporting_sla_is_not_init_from_array($sla)) {
$row[] = '<span style="font: bold '.$font_size.'em Arial, Sans-serif; color: '.COL_NOTINIT.';">' . $row[] = '<span style="font: bold '.$font_size.'em Arial, Sans-serif; color: '.COL_NOTINIT.';">' .
__('N/A') . '</span>'; __('N/A') . '</span>';
@ -646,6 +649,11 @@ function reporting_html_SLA($table, $item, $mini) {
$table->colspan['checks_global']['cell'] = 2; $table->colspan['checks_global']['cell'] = 2;
$table->data['checks_global']['cell'] = html_print_table($table3, true); $table->data['checks_global']['cell'] = html_print_table($table3, true);
} }
else {
$table->colspan['error']['cell'] = 3;
$table->data['error']['cell'] =
__('There are no Agent/Modules defined');
}
if (!empty($item['charts'])) { if (!empty($item['charts'])) {
$table1 = new stdClass(); $table1 = new stdClass();
@ -2313,7 +2321,7 @@ function reporting_html_availability(&$table, $item) {
global $config; global $config;
if (!empty($item["data"])) { if (!empty($item["data"]) || ($hide_notinit_agent !=1 && ($item['type'] == "availability" || $item['type'] == "sla"))) {
$table1 = new stdClass(); $table1 = new stdClass();
$table1->width = '99%'; $table1->width = '99%';
$table1->data = array (); $table1->data = array ();