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

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

View File

@ -1075,8 +1075,6 @@ class Tree
ON ta.id_agente = tasg.id_agent
LEFT JOIN talert_template_modules tatm
ON tatm.id_agent_module = tam.id_agente_modulo
AND tatm.id_alert_template = 1
OR tatm.id_alert_template = NULL
$inner
WHERE tam.disabled = 0 AND ta.disabled = 0
$condition
@ -1086,7 +1084,8 @@ class Tree
$agent_status_filter
$module_search_filter
$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;
}