tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-4982-Tree-View-Module-groups' into 'develop'

Browse Source 
Added Group by in tree view

See merge request artica/pandorafms!2903
This commit is contained in:
Daniel Rodriguez 2019-12-10 13:46:27 +01:00
commit f9c4a826d5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/class/Tree.class.php
View File

@ -1075,8 +1075,6 @@ class Tree
ON ta.id_agente = tasg.id_agent ON ta.id_agente = tasg.id_agent
LEFT JOIN talert_template_modules tatm LEFT JOIN talert_template_modules tatm
ON tatm.id_agent_module = tam.id_agente_modulo ON tatm.id_agent_module = tam.id_agente_modulo
AND tatm.id_alert_template = 1
OR tatm.id_alert_template = NULL
$inner $inner
WHERE tam.disabled = 0 AND ta.disabled = 0 WHERE tam.disabled = 0 AND ta.disabled = 0
$condition $condition
@ -1086,7 +1084,8 @@ class Tree
$agent_status_filter $agent_status_filter
$module_search_filter $module_search_filter
$tag_condition $tag_condition
ORDER BY tam.nombre ASC, tam.id_agente_modulo ASC"; GROUP BY tam.id_agente_modulo
ORDER BY tam.nombre ASC, tam.id_agente_modulo ASC";
return $sql; return $sql;
} }