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

2010-06-10 Sergio Martin <sergio.martin@artica.es> 

* include/functions_reporting.php: Fixed the colspan
	into the Custom Graph report item for bug: 3013859



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2906 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-06-14 09:14:30 +00:00
parent 84649ff12f
commit 6224a8a3da
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-10 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php: Fixed the colspan
into the Custom Graph report item for bug: 3013859
2010-06-11 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/graph_builder.php: Fixed the

4
pandora_console/include/functions_reporting.php
View File

@ -1638,7 +1638,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
// Put description at the end of the module (if exists)
if ($content["description"] != ""){
$table->colspan[1][0] = 3;
$table->colspan[2][0] = 3;
$data_desc = array();
$data_desc[0] = $content["description"];
array_push ($table->data, $data_desc);
@ -1659,7 +1659,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
$graph_height= get_db_sql ("SELECT height FROM tgraph WHERE id_graph = ".$content["id_gs"]);
$table->colspan[2][0] = 3;
$table->colspan[1][0] = 3;
$data = array ();
$data[0] = '<img src="include/fgraph.php?tipo=combined&id='.implode (',', $modules).'&weight_l='.implode (',', $weights).'&height='.$sizgraph_h.'&width='.$sizgraph_w.'&period='.$content['period'].'&date='.$report["datetime"].'&stacked='.$graph["stacked"].'&pure=1" border="1" alt="">';
array_push ($table->data, $data);