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

Fixed graphs in reports. Ticket #411

This commit is contained in:
Arturo Gonzalez 2017-03-01 12:10:01 +01:00
parent 8e0dd33c85
commit 44724e648d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/functions_reporting.php
View File

@ -5740,8 +5740,13 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
$return['type'] = 'custom_graph'; $return['type'] = 'custom_graph';
if (empty($content['name'])) { if (empty($content['name'])) {
if ($type_report == "custom_graph") {
$content['name'] = __('Custom graph');
}
else {
$content['name'] = __('Simple graph'); $content['name'] = __('Simple graph');
} }
}
$return['title'] = $content['name']; $return['title'] = $content['name'];
$return['subtitle'] = $graph['name']; $return['subtitle'] = $graph['name'];

3
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -1671,8 +1671,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
plot.setSelection(ranges); plot.setSelection(ranges);
}); });
//~ var legends = $('#legend_' + graph_id + ' .legendLabel'); var legends = $('#legend_' + graph_id + ' .legendLabel');
var updateLegendTimeout = null; var updateLegendTimeout = null;
var latestPosition = null; var latestPosition = null;