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

Merge branch '2974-Fallo_al_hacer_over_en_graficas' into 'develop' 

fixed minor errors in graphs an license diag

See merge request artica/pandorafms!1940
This commit is contained in:
vgilc 2018-11-07 15:06:29 +01:00
parent 9c143d1d00 58aa334798
commit 6cdb38b8ee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extras/pandora_diag.php
View File

@ -54,7 +54,7 @@ $rows = db_get_all_rows_in_table('tupdate_settings');
$settings = new StdClass;
foreach ($rows as $row) {
$settings->$row['key'] = $row['value'];
$settings->{$row['key']} = $row['value'];
}
echo '<script type="text/javascript">';

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

@ -1962,7 +1962,7 @@ function pandoraFlotArea( graph_id, values, legend,
if(series.data[j]){
var y = series.data[j][1];
var x = series.data[j][0] -1 ;
var x = Math.round(series.data[j][0]) -1;
}
}