From d4e837b7e6ff2f1a115500a69824b8594baf981c Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 28 Sep 2020 15:47:38 +0200 Subject: [PATCH] Group all management, "all" selected instead "none" if included --- pandora_console/include/functions_html.php | 2 ++ pandora_console/include/functions_profile.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 754db65a18..01adc2402d 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -482,6 +482,8 @@ function html_print_select_groups( if (is_array($selected) === false) { if (empty($selected) === false) { $fields = [ $selected => groups_get_name($selected) ]; + } else if ($returnAllGroup === true) { + $fields = [ $selected => groups_get_name(null, true) ]; } } else { foreach ($selected as $k) { diff --git a/pandora_console/include/functions_profile.php b/pandora_console/include/functions_profile.php index 029e54bbc2..afdd5246db 100644 --- a/pandora_console/include/functions_profile.php +++ b/pandora_console/include/functions_profile.php @@ -323,7 +323,7 @@ function profile_print_profile_table($id) $data['group'] = html_print_select_groups( $config['id_user'], 'UM', - users_is_admin($config['id_user']), + users_can_manage_group_all('UM'), 'assign_group', -1, '',