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-5728-bug-standard-users-pandora-administrator' into 'develop' 

Fixed user list for UM

See merge request artica/pandorafms!3241
This commit is contained in:
Alejandro Fraguas 2020-06-08 10:46:37 +02:00
parent bf66724c9f 24ddb370a7
commit a8bf9843ee
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/general/logon_ok.php
View File

@ -153,7 +153,7 @@ $table->rowclass[] = '';
$table->data[] = $tdata;
// Users.
if (users_is_admin()) {
if (users_is_admin() || check_acl($config['id_user'], 0, 'UM')) {
$tdata = [];
$tdata[0] = reporting_get_stats_users($data);
$table->rowclass[] = '';

2
pandora_console/godmode/users/user_list.php
View File

@ -419,7 +419,7 @@ else {
$result = array_intersect($g, $own_groups);
// Show users without profile too.
if (!$usr['is_admin'] && !empty($result) || (!$usr['is_admin'] && db_get_all_rows_field_filter('tusuario_perfil', 'id_usuario', $usr['id_user']) === false)) {
if (!empty($result) || (db_get_all_rows_field_filter('tusuario_perfil', 'id_usuario', $usr['id_user']) === false)) {
$info[$key] = $usr;
}