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-4678-No-funciona-macro-moduledata-modulename-cuando-el-tipo-de-modulo-es-string-y-no-generic-data-string' into 'develop' 

Ent 4678 no funciona macro moduledata modulename cuando el tipo de modulo es string y no generic data string

See merge request artica/pandorafms!2781
This commit is contained in:
Daniel Rodriguez 2019-10-07 19:20:08 +02:00
parent d198cc3297 5a2ca8e65f
commit 588d2f60ef
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -4094,7 +4094,7 @@ sub on_demand_macro($$$$$$;$) {
my $unit_mod = get_db_value ($dbh, 'SELECT unit FROM tagente_modulo WHERE id_agente_modulo = ?', $id_mod); my $unit_mod = get_db_value ($dbh, 'SELECT unit FROM tagente_modulo WHERE id_agente_modulo = ?', $id_mod);
my $field_value = ""; my $field_value = "";
if ($type_mod eq 3){ if ($type_mod eq 3 || $type_mod eq 23|| $type_mod eq 17 || $type_mod eq 10 || $type_mod eq 33 ){
$field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos_string where id_agente_modulo = ? order by utimestamp desc limit 1', $id_mod); $field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos_string where id_agente_modulo = ? order by utimestamp desc limit 1', $id_mod);
} }
else{ else{