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-6497-bug-en-item-group-alert-report-seleccionando-el-grupo-all' into 'develop' 

Forced recursion while selecting All group - group_alert_report

See merge request artica/pandorafms!3543
This commit is contained in:
Daniel Rodriguez 2020-10-29 12:40:43 +01:00
parent 83233b6192 6112b3e932
commit 8144d3bc95
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -3744,6 +3744,16 @@ $(document).ready (function () {
$("#combo_group").change (
function () {
// Alert report group must show all matches when selecting All group
// ignoring 'recursion' option. #6497.
if ($("#combo_group").val() == 0) {
$('#checkbox-recursion').attr('disabled',true)
$('#checkbox-recursion').attr('checked','checked')
} else {
$('#checkbox-recursion').removeAttr('disabled')
}
$("#id_agents").html('');
$("#id_agents2").html('');
$("#module").html('');
@ -3772,6 +3782,7 @@ $(document).ready (function () {
);
}
);
$("#combo_group").change();
$("#checkbox-recursion").change (
function () {

2
pandora_console/include/functions_reporting.php
View File

@ -3912,7 +3912,7 @@ function reporting_alert_report_group($report, $content)
$agent_modules = alerts_get_agent_modules(
$content['id_group'],
$content['recursion']
(((string) $content['id_group'] === '0') ? true : $content['recursion'])
);
if (empty($alerts)) {