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

Merge branch '1167-Fallo_en_exportación_a_CSV_de_Custom_Graphs' into 'develop' 

fixed error exportation csv in custom graphs

See merge request
This commit is contained in:
vgilc 2017-08-14 12:16:47 +02:00
parent baf9b6aa5a fb9f187287
commit f5d161b108
1 changed files with 5 additions and 2 deletions
pandora_console/include/graphs/flot
jquery.flot.exportdata.pandora.js

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

@ -88,7 +88,10 @@
else if (typeof labels[index] !== 'undefined')
date = labels[index];
result.data.push([date, value,dataObject.label]);
var clean_label = dataObject.label;
clean_label = clean_label.replace( new RegExp("<.*?>", "g"), "");
clean_label = clean_label.replace( new RegExp(";", "g"), "");
result.data.push([date, value, clean_label]);
});
}
/* [
@ -139,7 +142,7 @@
try {
var elements = [];
var custom_graph = $('input:hidden[name=custom_graph]').value;
var custom_graph = $('#hidden-custom_graph').val();
if (custom_graph) {
dataObject = retrieveDataOject(dataObjects);