From 9fc635a7a920cc8ae92fdc9d6c5c0af5d3407168 Mon Sep 17 00:00:00 2001 From: alejandro-campos <alejandro.campos@artica.es> Date: Tue, 5 Nov 2019 11:03:28 +0100 Subject: [PATCH 1/2] user ack filter in event list not displaying users with all group --- pandora_console/operation/events/events.php | 2 +- pandora_console/operation/events/events_list.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index bc9c59eda5..12d4cbd087 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -1018,7 +1018,7 @@ $adv_inputs[] = $in; $user_users = users_get_user_users( $config['id_user'], $access, - users_can_manage_group_all() + users_can_manage_group_all($access) ); $data = html_print_select( diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 298310a845..fc16470e37 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -767,7 +767,7 @@ $data[0] = __('User ack.').$jump; $user_users = users_get_user_users( $config['id_user'], $access, - users_can_manage_group_all() + users_can_manage_group_all($access) ); $data[0] .= html_print_select( From e9b516c3990245faa5850299de8bf999e0535a54 Mon Sep 17 00:00:00 2001 From: alejandro-campos <alejandro.campos@artica.es> Date: Wed, 6 Nov 2019 12:56:42 +0100 Subject: [PATCH 2/2] change access permission to users in user ack filter in event list --- pandora_console/operation/events/events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 12d4cbd087..86b782f696 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -1018,7 +1018,7 @@ $adv_inputs[] = $in; $user_users = users_get_user_users( $config['id_user'], $access, - users_can_manage_group_all($access) + true ); $data = html_print_select(