tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
user ack filter in event list not displaying users with all group

See merge request artica/pandorafms!2860
This commit is contained in:
Daniel Rodriguez 2019-11-06 14:45:09 +01:00
commit 137571f2d1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/operation/events/events.php
View File

@ -1018,7 +1018,7 @@ $adv_inputs[] = $in;
$user_users = users_get_user_users( $user_users = users_get_user_users(
$config['id_user'], $config['id_user'],
$access, $access,
users_can_manage_group_all() true
); );
$data = html_print_select( $data = html_print_select(

2
pandora_console/operation/events/events_list.php
View File

@ -767,7 +767,7 @@ $data[0] = __('User ack.').$jump;
$user_users = users_get_user_users( $user_users = users_get_user_users(
$config['id_user'], $config['id_user'],
$access, $access,
users_can_manage_group_all() users_can_manage_group_all($access)
); );
$data[0] .= html_print_select( $data[0] .= html_print_select(