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

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

* include/graphs/flot/pandora.flot.js: cleaned source code style.
	
	* include/graphs/functions_utils.php: fixed the unasigned var.
	
	Fixes: #3603439




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7597 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-06 15:18:08 +00:00
parent 5767594f30
commit db0aab59c0
3 changed files with 178 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-02-06 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/flot/pandora.flot.js: cleaned source code style.
* include/graphs/functions_utils.php: fixed the unasigned var.
Fixes: #3603439
2013-02-06 Miguel de Dios <miguel.dedios@artica.es> 2013-02-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, include/functions_ui.php, * include/functions_graph.php, include/functions_ui.php,

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

@ -199,7 +199,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, maxvalue, water_
// Format functions // Format functions
function xFormatter(v, axis) { function xFormatter(v, axis) {
if(labels[v] != undefined) { if (labels[v] != undefined) {
return labels[v]; return labels[v];
} }
else { else {
@ -788,7 +788,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
var label_aux = series.label + ' = '; var label_aux = series.label + ' = ';
if(serie_types[i] != 'points') { if (serie_types[i] != 'points') {
legends.eq(i).text(label_aux.replace(/=.*/, '= ' + parseFloat(y).toFixed(2) +' '+unit)); legends.eq(i).text(label_aux.replace(/=.*/, '= ' + parseFloat(y).toFixed(2) +' '+unit));
} }

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

@ -134,7 +134,7 @@ function graph_get_max_index($legend_values) {
function setup_watermark($water_mark, &$water_mark_file, &$water_mark_url) { function setup_watermark($water_mark, &$water_mark_file, &$water_mark_url) {
if (!is_array($water_mark)) { if (!is_array($water_mark)) {
$water_mark['file'] = $water_mark; $water_mark_file = $water_mark;
} }
if (isset($water_mark['file'])) { if (isset($water_mark['file'])) {