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-6477-error-en-la-seleccion-de-grupos-de-dashboards' into 'develop' 

Minor fix all group empty label

See merge request
This commit is contained in:
Daniel Rodriguez 2020-10-29 12:20:35 +01:00
parent a8cadc6d5c 25295f7b0b
commit 4ed68fee56
3 changed files with 21 additions and 3 deletions

10
pandora_console/include/functions_html.php
View File

@ -519,7 +519,15 @@ function html_print_select_groups(
}
} else {
foreach ($selected as $k) {
$fields[$k] = groups_get_name($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);
}
}

7
pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
View File

@ -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,
],

7
pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php
View File

@ -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,
],