tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1251-export-data-to-csv-in-graph-container-dev' into 'develop'

Browse Source 
Fixed error in js library and added good export to graph container graphs

See merge request !828
This commit is contained in:
vgilc 2017-10-04 14:28:38 +02:00
commit 45c35a1a0f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/godmode/reporting/graph_container.php
View File

@ -54,6 +54,7 @@ if (enterprise_include_once('include/functions_reporting.php') !== ENTERPRISE_NO
$enterpriseEnable = true; $enterpriseEnable = true;
} }
html_print_input_hidden ('custom_graph', 1);
if ($enterpriseEnable) { if ($enterpriseEnable) {
$buttons = reporting_enterprise_add_template_graph_tabs($buttons); $buttons = reporting_enterprise_add_template_graph_tabs($buttons);
} }

5
pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
View File

@ -34,10 +34,7 @@
} }
if (dataObjects.length > 1) { if (dataObjects.length > 1) {
dataObjects.forEach(function (element) { dataObjects.forEach(function (element) {
if (/^Avg.:/i.test(element.label)) result = element;
result = element;
if (/^Percentil/i.test(element.label))
result = element;
}); });
// If the avg set is missing, retrieve the first set // If the avg set is missing, retrieve the first set