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-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios-3' into 'develop' 

Fixed alerts_get_alerts function

See merge request artica/pandorafms!1757
This commit is contained in:
vgilc 2018-09-12 17:44:56 +02:00
parent a90f568287 a25d4ed166
commit d36a1c37f9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_alerts.php
View File

@ -106,6 +106,8 @@ function alerts_get_alerts($id_group = 0, $free_search = "", $status = "all", $s
ON t0.id_agent_module = t2.id_agente_modulo ON t0.id_agent_module = t2.id_agente_modulo
INNER JOIN tagente t3 INNER JOIN tagente t3
ON t2.id_agente = t3.id_agente ON t2.id_agente = t3.id_agente
LEFT JOIN tagent_secondary_group tasg
ON tasg.id_agent = t3.id_agente
WHERE 1=1 WHERE 1=1
' . $status_query . ' ' . $standby_query . ' ' . $group_query . ' ' . $status_query . ' ' . $standby_query . ' ' . $group_query . '
AND (t1.name LIKE "%' . $free_search . '%" AND (t1.name LIKE "%' . $free_search . '%"