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

Merge branch '2938-Problema-con-tags-en-el-wizard-y-la-vista-de-informes-return-dev' into 'develop' 

Fixed issue with secondary group

See merge request artica/pandorafms!2049

Former-commit-id: a15d60276ecf0e0e782907a1036741e68aa577ef
This commit is contained in:
vgilc 2018-12-07 11:35:05 +01:00
parent e472612597 b155b06ae9
commit b901e1db0f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/operation/agentes/ver_agente.php
View File

@ -343,7 +343,8 @@ if (is_ajax ()) {
'module_condition', 'AND', 'tagente_modulo', false, array(), true); 'module_condition', 'AND', 'tagente_modulo', false, array(), true);
$sql_tags_join = "INNER JOIN tagente ON tagente.id_agente = t1.id_agente $sql_tags_join = "INNER JOIN tagente ON tagente.id_agente = t1.id_agente
INNER JOIN ttag_module ON ttag_module.id_agente_modulo = t1.id_agente_modulo"; INNER JOIN ttag_module ON ttag_module.id_agente_modulo = t1.id_agente_modulo
LEFT JOIN tagent_secondary_group tasg ON tagente.id_agente = tasg.id_agent";
} }
if (is_metaconsole()) { if (is_metaconsole()) {