Merge branch '2927-Error-en-vista-de-alertas-lanzadas' into 'develop'
Fixed bug in alert details See merge request artica/pandorafms!1887
This commit is contained in:
commit
b97a9e2989
|
@ -1845,9 +1845,9 @@ function get_group_alerts($id_group, $filter = '', $options = false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$selectText = 'talert_template_modules.*, t2.nombre AS agent_module_name, t3.alias AS agent_name, t4.name AS template_name';
|
$selectText = 'DISTINCT talert_template_modules.*, t2.nombre AS agent_module_name, t3.alias AS agent_name, t4.name AS template_name';
|
||||||
if ($count !== false) {
|
if ($count !== false) {
|
||||||
$selectText = 'COUNT(talert_template_modules.id) AS count';
|
$selectText = 'COUNT(DISTINCT talert_template_modules.id) AS count';
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql = sprintf ("SELECT %s
|
$sql = sprintf ("SELECT %s
|
||||||
|
@ -1871,7 +1871,7 @@ function get_group_alerts($id_group, $filter = '', $options = false,
|
||||||
return $alerts[0]['count'];
|
return $alerts[0]['count'];
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return $alerts;
|
return $alerts;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue