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

2013-10-04 Sergio Martin <sergio.martin@artica.es> 

* include/functions_alerts.php: Fixed group filter in
	alerts view for incident #218



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8850 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-10-04 08:24:42 +00:00
parent 2d7f6e2f06
commit 9990a5a0a3
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Fixed group filter in
alerts view for incident #218
2013-10-03 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.wizard.php: fixed the

14
pandora_console/include/functions_alerts.php
View File

@ -1528,18 +1528,22 @@ function get_group_alerts($id_group, $filter = '', $options = false,
global $config;
$group_query = '';
if (!empty($idGroup)) {
$group_query = ' AND id_grupo = ' . $idGroup;
}
if (is_array($filter)) {
$disabled = $filter['disabled'];
if (isset($filter['standby'])) {
$filter = ' AND talert_template_modules.standby = "'.$filter['standby'].'"';
$filter = $group_query . ' AND talert_template_modules.standby = "'.$filter['standby'].'"';
}
else {
$filter = '';
$filter = $group_query;
}
}
else {
$filter = '';
$filter = $group_query;
$disabled = $filter;
}
@ -1640,8 +1644,6 @@ function get_group_alerts($id_group, $filter = '', $options = false,
$selectText = 'COUNT(talert_template_modules.id) AS count';
}
$sql = sprintf ("SELECT %s
FROM talert_template_modules
INNER JOIN tagente_modulo t2