This commit is contained in:
fbsanchez 2020-10-20 18:06:05 +02:00
parent 033dd531a8
commit 25295f7b0b
3 changed files with 20 additions and 2 deletions

View File

@ -510,8 +510,16 @@ function html_print_select_groups(
} }
} else { } else {
foreach ($selected as $k) { foreach ($selected as $k) {
if ($k === null || $k === '') {
continue;
}
$fields[$k] = groups_get_name($k, $returnAllGroup); $fields[$k] = groups_get_name($k, $returnAllGroup);
} }
if (empty($fields) === true && $returnAllGroup) {
$fields[0] = groups_get_name(null, true);
}
} }
if (empty($nothing) === false) { if (empty($nothing) === false) {

View File

@ -278,6 +278,11 @@ class TopNEventByGroupWidget extends Widget
]; ];
// Groups. // Groups.
$selected_groups = [];
if ($values['groupId']) {
$selected_groups = explode(',', $values['groupId'][0]);
}
$inputs[] = [ $inputs[] = [
'label' => __('Groups'), 'label' => __('Groups'),
'arguments' => [ 'arguments' => [
@ -285,7 +290,7 @@ class TopNEventByGroupWidget extends Widget
'name' => 'groupId[]', 'name' => 'groupId[]',
'returnAllGroup' => true, 'returnAllGroup' => true,
'privilege' => 'AR', 'privilege' => 'AR',
'selected' => explode(',', $values['groupId'][0]), 'selected' => $selected_groups,
'return' => true, 'return' => true,
'multiple' => true, 'multiple' => true,
], ],

View File

@ -277,6 +277,11 @@ class TopNEventByModuleWidget extends Widget
], ],
]; ];
$selected_groups = [];
if ($values['groupId']) {
$selected_groups = explode(',', $values['groupId'][0]);
}
// Groups. // Groups.
$inputs[] = [ $inputs[] = [
'label' => __('Groups'), 'label' => __('Groups'),
@ -285,7 +290,7 @@ class TopNEventByModuleWidget extends Widget
'name' => 'groupId[]', 'name' => 'groupId[]',
'returnAllGroup' => true, 'returnAllGroup' => true,
'privilege' => 'AR', 'privilege' => 'AR',
'selected' => explode(',', $values['groupId'][0]), 'selected' => $selected_groups,
'return' => true, 'return' => true,
'multiple' => true, 'multiple' => true,
], ],