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

Merge branch 'ent-4481-entities-en-graficas-personalizadas-bullet-chart' into 'develop' 

remove entities custom graph bullet chart

See merge request artica/pandorafms!2640
This commit is contained in:
vgilc 2019-12-10 11:50:57 +01:00
parent 418cf73c87 be3dcccc4d
commit 8d0b86c420
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_graph.php
View File

@ -1761,7 +1761,7 @@ function graphic_combined_module(
$search_in_history_db = db_search_in_history_db($datelimit);
$temp[$module] = modules_get_agentmodule($module);
$temp[$module] = io_safe_output(modules_get_agentmodule($module));
$query_last_value = sprintf(
'
SELECT datos
@ -1787,7 +1787,7 @@ function graphic_combined_module(
if (!empty($params_combined['labels'])
&& isset($params_combined['labels'][$module])
) {
$label = io_safe_input($params_combined['labels'][$module]);
$label = io_safe_output($params_combined['labels'][$module]);
} else {
$alias = db_get_value(
'alias',