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

Merge branch 'remove-traces-debug' into 'develop' 

remove debug console.log traces.

See merge request !266
This commit is contained in:
vgilc 2017-04-04 13:47:41 +02:00
parent 09b9866b89 b937db8f35
commit 6b2cdb9784
5 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/ajax/visual_console.ajax.php
View File

@ -39,8 +39,8 @@ $render_map = (bool)get_parameter('render_map', false);
$graph_javascript = (bool)get_parameter('graph_javascript', false);
if ($render_map) {
$width = (int)get_parameter('width', '400');
$height = (int)get_parameter('height', '400');
$width = (int) get_parameter('width', '400');
$height = (int) get_parameter('height', '400');
$keep_aspect_ratio = (bool) get_parameter('keep_aspect_ratio');
visual_map_print_visual_map($id_visual_console, true, true, $width,

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

@ -1923,11 +1923,9 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
if (thresholded) {
$.each(data_base, function() {
// Prepared to turning series
//if(showed[this.id.split('_')[1]]) {
datas.push(this);
//}
datas.push(this);
});
plot = $.plot($('#' + graph_id), data_base,
$.extend(true, {}, options, {
yaxis: {max: max_draw},
@ -1935,7 +1933,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
thresholded = false;
}
else {
var max_draw = plot.getAxes().yaxis.datamax;
if (max_draw < red_threshold || max_draw < yellow_threshold) {
@ -1945,7 +1942,8 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
$.extend(true, {}, options, {
yaxis: {max: maxim_data + (maxim_data*0.5)},
}));
} else {
}
else {
plot = $.plot($('#' + graph_id), data_base,
$.extend(true, {}, options, {
yaxis: {max: plot.getAxes().yaxis.max},
@ -1954,13 +1952,10 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
datas = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
yellow_threshold, red_threshold, extremes, red_up);
thresholded = true;
}
plot.setData(datas);
plot.draw();
//~ plot.setSelection(currentRanges);
});
$('#menu_cancelzoom_' + graph_id).click(function() {

2
pandora_console/include/javascript/pandora.js
View File

@ -401,8 +401,6 @@ function alert_templates_changed_by_multiple_agents_with_alerts (event, id_agent
templates.push($(val).val());
});
console.log(templates);
$('#module').attr ('disabled', 1);
$('#module').empty ();
$('#module').append ($('<option></option>').html ("Loading...").attr ("value", 0));

1
pandora_console/include/javascript/pandora_events.js
View File

@ -542,7 +542,6 @@ function show_events_group_agent (id_insert, id_agent, server_id) {
data: parameter,
dataType: 'html',
success: function (data) {
console.log(data);
$("#"+id_insert).html(data);
$("#"+id_insert).toggle();
}

1
pandora_console/operation/agentes/estado_agente.php
View File

@ -652,7 +652,6 @@ else {
<script type="text/javascript">
$(document).ready (function () {
$("[class^='left']").mouseenter (function () {
console.log($(this));
$(".agent"+$(this)[0].className).css('visibility', '');
}).mouseleave(function () {
$(".agent"+$(this)[0].className).css('visibility', 'hidden');