From ae657210f89a008d368d81501bc6540e6fe7fbd7 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 19 Sep 2017 17:46:12 +0200 Subject: [PATCH] Fixed error in js library and added good export to graph container graphs --- pandora_console/godmode/reporting/graph_container.php | 1 + .../include/graphs/flot/jquery.flot.exportdata.pandora.js | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/reporting/graph_container.php b/pandora_console/godmode/reporting/graph_container.php index 6c4903fbb8..5be4af15a2 100644 --- a/pandora_console/godmode/reporting/graph_container.php +++ b/pandora_console/godmode/reporting/graph_container.php @@ -54,6 +54,7 @@ if (enterprise_include_once('include/functions_reporting.php') !== ENTERPRISE_NO $enterpriseEnable = true; } +html_print_input_hidden ('custom_graph', 1); if ($enterpriseEnable) { $buttons = reporting_enterprise_add_template_graph_tabs($buttons); } diff --git a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js index e8bb747901..18592b05c3 100644 --- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js +++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js @@ -34,10 +34,7 @@ } if (dataObjects.length > 1) { dataObjects.forEach(function (element) { - if (/^Avg.:/i.test(element.label)) - result = element; - if (/^Percentil/i.test(element.label)) - result = element; + result = element; }); // If the avg set is missing, retrieve the first set