diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 02e31a4754..025416ec47 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -510,8 +510,16 @@ function html_print_select_groups( } } else { foreach ($selected as $k) { + if ($k === null || $k === '') { + continue; + } + $fields[$k] = groups_get_name($k, $returnAllGroup); } + + if (empty($fields) === true && $returnAllGroup) { + $fields[0] = groups_get_name(null, true); + } } if (empty($nothing) === false) { diff --git a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php index 2acd7f32fa..bd7d7d5886 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php +++ b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php @@ -278,6 +278,11 @@ class TopNEventByGroupWidget extends Widget ]; // Groups. + $selected_groups = []; + if ($values['groupId']) { + $selected_groups = explode(',', $values['groupId'][0]); + } + $inputs[] = [ 'label' => __('Groups'), 'arguments' => [ @@ -285,7 +290,7 @@ class TopNEventByGroupWidget extends Widget 'name' => 'groupId[]', 'returnAllGroup' => true, 'privilege' => 'AR', - 'selected' => explode(',', $values['groupId'][0]), + 'selected' => $selected_groups, 'return' => true, 'multiple' => true, ], diff --git a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php index 4bbaee22a8..148ace6aac 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php +++ b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php @@ -277,6 +277,11 @@ class TopNEventByModuleWidget extends Widget ], ]; + $selected_groups = []; + if ($values['groupId']) { + $selected_groups = explode(',', $values['groupId'][0]); + } + // Groups. $inputs[] = [ 'label' => __('Groups'), @@ -285,7 +290,7 @@ class TopNEventByModuleWidget extends Widget 'name' => 'groupId[]', 'returnAllGroup' => true, 'privilege' => 'AR', - 'selected' => explode(',', $values['groupId'][0]), + 'selected' => $selected_groups, 'return' => true, 'multiple' => true, ],