Merge branch 'ent-4856-8969-Filtro-user-ack-evento-no-funciona-del-todo-bien' into 'develop'

user ack filter in event list not displaying users with all group See merge request artica/pandorafms!2860
2019-11-06 14:45:09 +01:00 · 2019-11-06 14:45:09 +01:00 · 137571f2d1
parent d460429509 e9b516c399
commit 137571f2d1
2 changed files with 2 additions and 2 deletions
--- 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()
+    true
 );

 $data = html_print_select(
--- 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(