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:
commit
8144d3bc95
|
@ -3744,6 +3744,16 @@ $(document).ready (function () {
|
||||||
|
|
||||||
$("#combo_group").change (
|
$("#combo_group").change (
|
||||||
function () {
|
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_agents").html('');
|
||||||
$("#id_agents2").html('');
|
$("#id_agents2").html('');
|
||||||
$("#module").html('');
|
$("#module").html('');
|
||||||
|
@ -3772,6 +3782,7 @@ $(document).ready (function () {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
$("#combo_group").change();
|
||||||
|
|
||||||
$("#checkbox-recursion").change (
|
$("#checkbox-recursion").change (
|
||||||
function () {
|
function () {
|
||||||
|
|
|
@ -3912,7 +3912,7 @@ function reporting_alert_report_group($report, $content)
|
||||||
|
|
||||||
$agent_modules = alerts_get_agent_modules(
|
$agent_modules = alerts_get_agent_modules(
|
||||||
$content['id_group'],
|
$content['id_group'],
|
||||||
$content['recursion']
|
(((string) $content['id_group'] === '0') ? true : $content['recursion'])
|
||||||
);
|
);
|
||||||
|
|
||||||
if (empty($alerts)) {
|
if (empty($alerts)) {
|
||||||
|
|
Loading…
Reference in New Issue