tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2939-Bug-en-la-vista-de-graficas-de-un-agente' into 'develop'

Browse Source 
Fixed bug in agent graph view

See merge request artica/pandorafms!1955
This commit is contained in:
vgilc 2018-11-30 13:07:03 +01:00
commit 5a3911d185
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,7 +204,7 @@
$form $form
.prop('method', 'POST') .prop('method', 'POST')
.prop('action', plot.getOptions().export.homeurl + '/include/graphs/export_data.php') .prop('action', plot.getOptions().export.homeurl + 'include/graphs/export_data.php')
.append($dataInput, $typeInput, $separatorInput, $excelInput) .append($dataInput, $typeInput, $separatorInput, $excelInput)
.hide() .hide()
// Firefox made me write into the DOM for this :( // Firefox made me write into the DOM for this :(
@ -394,7 +394,7 @@
$form $form
.prop('method', 'POST') .prop('method', 'POST')
.prop('action', plot.getOptions().export.homeurl + '/include/graphs/export_data.php') .prop('action', plot.getOptions().export.homeurl + 'include/graphs/export_data.php')
.append($dataInput, $typeInput, $separatorInput, $excelInput) .append($dataInput, $typeInput, $separatorInput, $excelInput)
.hide() .hide()
// Firefox made me write into the DOM for this :( // Firefox made me write into the DOM for this :(

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

@ -1874,7 +1874,7 @@ function pandoraFlotArea( graph_id, values, legend,
})); }));
} }
$('#menu_cancelzoom_' + graph_id).attr('src', homeurl + '/images/zoom_cross_grey.png'); $('#menu_cancelzoom_' + graph_id).attr('src', homeurl + 'images/zoom_cross_grey.png');
max_draw['max'] = ranges.yaxis.to; max_draw['max'] = ranges.yaxis.to;
max_draw['min'] = ranges.yaxis.from; max_draw['min'] = ranges.yaxis.from;
@ -2331,7 +2331,7 @@ function pandoraFlotArea( graph_id, values, legend,
legend: { show: true } legend: { show: true }
})); }));
$('#menu_cancelzoom_' + graph_id) $('#menu_cancelzoom_' + graph_id)
.attr('src', homeurl + '/images/zoom_cross.disabled.png'); .attr('src', homeurl + 'images/zoom_cross.disabled.png');
overview.clearSelection(); overview.clearSelection();
currentRanges = null; currentRanges = null;
thresholded = false; thresholded = false;