X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Fusers.php;h=d51cafcab8bb21ce5dbc23c2de75ccd355f988d3;hb=691958794018beda9788e9bdb47d640a116af492;hp=0c54751de7e41f66f58b24e6fc8a4ae5385959d3;hpb=fafb0ae8f7098ffafa6799627891bd40f4811a52;p=timetracker.git diff --git a/mobile/users.php b/mobile/users.php index 0c54751d..d51cafca 100644 --- a/mobile/users.php +++ b/mobile/users.php @@ -40,23 +40,24 @@ if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) { // End of access checks. // Prepare a list of active users. +$rank = $user->getMaxRankForGroup($user->getGroup()); if ($user->can('view_users')) $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true); else /* if ($user->can('manage_users')) */ - $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true); + $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true); $active_users = $user->getUsers($options); // Prepare a list of inactive users. if($user->can('manage_users')) { - $options = array('status'=>INACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_login'=>true,'include_role'=>true); + $options = array('status'=>INACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_login'=>true,'include_role'=>true); $inactive_users = $user->getUsers($options); } $uncompleted_indicators = $user->getConfigOption('uncompleted_indicators'); if ($uncompleted_indicators) { // Check each active user if they have an uncompleted time entry. - foreach ($active_users as $key => $user) { - $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']); + foreach ($active_users as $key => $active_user) { + $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']); } $smarty->assign('uncompleted_indicators', true); }