2013-02-01 Miguel de Dios <miguel.dedios@artica.es>

* include/graphs/functions_utils.php: fixed check color and legends
	for stacked graphs when haven't set colors all graphs.
	
	Fixes: #3602725




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7562 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-01 13:28:49 +00:00
parent 70502d2ce9
commit cc2cf11837
2 changed files with 28 additions and 22 deletions

View File

@ -1,3 +1,10 @@
2013-02-01 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/functions_utils.php: fixed check color and legends
for stacked graphs when haven't set colors all graphs.
Fixes: #3602725
2013-02-01 Sergio Martin <sergio.martin@artica.es> 2013-02-01 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php * include/functions_ui.php

View File

@ -92,10 +92,10 @@ function stack_data(&$chart_data, &$legend = null, &$color = null) {
$chart_data[$val_x][$graph] += $prev_val; $chart_data[$val_x][$graph] += $prev_val;
$prev_val = $chart_data[$val_x][$graph]; $prev_val = $chart_data[$val_x][$graph];
$temp_data[$val_x][$key] = $chart_data[$val_x][$graph]; $temp_data[$val_x][$key] = $chart_data[$val_x][$graph];
if (isset($color)) { if (isset($color[$graph])) {
$temp_color[$key] = $color[$graph]; $temp_color[$key] = $color[$graph];
} }
if (isset($legend)) { if (isset($legend[$graph])) {
$temp_legend[$key] = $legend[$graph]; $temp_legend[$key] = $legend[$graph];
} }
$key--; $key--;
@ -151,5 +151,4 @@ function setup_watermark($water_mark, &$water_mark_file, &$water_mark_url) {
$water_mark_url = ''; $water_mark_url = '';
} }
} }
?> ?>