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

2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_graph.php
	include/functions_graph.php: Fixed PDF exportation of combined 
	graphs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5206 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-29 16:12:20 +00:00
parent b06e9a731a
commit c605536b33
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
include/functions_graph.php: Fixed PDF exportation of combined
graphs.
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events_list.php: Resized graph in this view.

5
pandora_console/include/functions_graph.php
View File

@ -741,19 +741,16 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
if ($only_image) {
$flash_charts = false;
}
<<<<<<< .mine
if ($flash_charts){
include_flash_chart_script();
}
=======
if ($flash_charts){
include_flash_chart_script();
}
>>>>>>> .r5204
switch ($stacked) {
case GRAPH_AREA:
$color = null;