tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop' 

show only events filter in acl groups

See merge request artica/pandorafms!4451
This commit is contained in:
Daniel Rodriguez 2021-10-08 08:09:19 +00:00
parent eb5b34b99e d4108c4e8b
commit 16f2c776f2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/users/configure_user.php
View File

@ -721,6 +721,7 @@ if ($update_user) {
);
}
if ($values['strict_acl']) {
$count_groups = 0;
$count_tags = 0;
@ -1226,7 +1227,10 @@ $session_time .= html_print_input_text(
'class="input_line_small"'
).'</div>';
$event_filter_data = db_get_all_rows_sql('SELECT id_name, id_filter FROM tevent_filter');
$user_groups = implode(',', array_keys((users_get_groups($id, 'AR', $display_all_group))));
$event_filter_data = db_get_all_rows_sql('SELECT id_name, id_filter FROM tevent_filter WHERE id_group_filter IN ('.$user_groups.')');
if ($event_filter_data === false) {
$event_filter_data = [];
}

3
pandora_console/operation/users/user_edit.php
View File

@ -438,8 +438,9 @@ if (isset($double_authentication)) {
if (check_acl($config['id_user'], 0, 'ER')) {
$event_filter = '<div class="label_select"><p class="edit_user_labels">'.__('Event filter').'</p>';
$user_groups = implode(',', array_keys((users_get_groups($config['id_user'], 'AR', $display_all_group))));
$event_filter .= html_print_select_from_sql(
'SELECT id_filter, id_name FROM tevent_filter',
'SELECT id_filter, id_name FROM tevent_filter WHERE id_group_filter IN ('.$user_groups.')',
'event_filter',
$user_info['default_event_filter'],
'',