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-6818-bug-en-label-de-informes-y-plantillas' into 'develop' 

fixed error with label reporting views

See merge request artica/pandorafms!3938
This commit is contained in:
Daniel Rodriguez 2021-04-09 09:24:44 +00:00
parent 1fb259c35f 31e6d75229
commit 1b9916c6e9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_reporting.php
View File

@ -5644,7 +5644,7 @@ function reporting_value($report, $content, $type, $pdf=false)
);
}
$label = (isset($content['name'])) ? $content['name'] : '';
$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($label != '') {
$label = reporting_label_macro(
$items_label,
@ -9170,6 +9170,7 @@ function reporting_simple_graph(
$return['agent_name'] = $agent_alias;
$return['module_name'] = $module_name;
$return['description'] = $description;
$return['label'] = $label;
$return['date'] = reporting_get_date_text(
$report,
$content
@ -9211,7 +9212,8 @@ function reporting_simple_graph(
$params = [
'agent_module_id' => $content['id_agent_module'],
'period' => $content['period'],
'title' => $label,
'title' => $title,
'label' => $label,
'pure' => false,
'date' => $report['datetime'],
'only_image' => $only_image,