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

Merge branch '3151-Fallo-jquery-en-consola-mobile' into 'develop' 

fixed bug: pie graph not showing in mobile's tactical view dashboard widget

See merge request artica/pandorafms!2027

Former-commit-id: d3a814853a43ea8c6c5c621893a4eaaac3e7d401
This commit is contained in:
vgilc 2018-12-21 10:22:41 +01:00
parent 2a407bb494 8d2daf3948
commit 4f43396d81
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_reporting.php
View File

@ -10003,7 +10003,7 @@ You can of course remove the warnings, that's why we include the source and do n
$output .= 'parameters["page"] = "include/ajax/events";'; $output .= 'parameters["page"] = "include/ajax/events";';
$output .= 'parameters["total_events"] = 1;'; $output .= 'parameters["total_events"] = 1;';
$output .= '$.ajax({type: "GET",url: "ajax.php",data: parameters,'; $output .= '$.ajax({type: "GET",url: "/pandora_console/ajax.php",data: parameters,';
$output .= 'success: function(data) {'; $output .= 'success: function(data) {';
$output .= '$("#total_events").text(data);'; $output .= '$("#total_events").text(data);';
$output .= '}'; $output .= '}';

2
pandora_console/include/graphs/functions_flot.php
View File

@ -409,6 +409,8 @@ function flot_pie_chart ($values, $labels, $width, $height, $water_mark,
$colors = implode($separator, $colors); $colors = implode($separator, $colors);
} }
include_javascript_dependencies_flot_graph();
$return .= "<script type='text/javascript'>"; $return .= "<script type='text/javascript'>";
$return .= "pandoraFlotPie('$graph_id', '$values', '$labels', $return .= "pandoraFlotPie('$graph_id', '$values', '$labels',