X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Fusers.php;h=4723543d8575c85c2d90978cc6a8bf4a0a95c94c;hb=3bf66d275fd148785cd2132dd5013c2960e81eac;hp=b3d8ae7e8cab7f1749afe46234b22a3abc166f29;hpb=170717b62207bd2da1628959d55b691a2d6f95a3;p=timetracker.git diff --git a/mobile/users.php b/mobile/users.php index b3d8ae7e..4723543d 100644 --- a/mobile/users.php +++ b/mobile/users.php @@ -31,27 +31,31 @@ import('form.Form'); import('ttTeamHelper'); import('ttTimeHelper'); -// Access check. -if (!ttAccessCheck(right_data_entry)) { +// Access checks. +if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) { header('Location: access_denied.php'); exit(); } +// End of access checks. // Get users. $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true)); if($user->canManageTeam()) { $can_delete_manager = (1 == count($active_users)); - $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true); + $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true); } -// 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']); +// Check if the team is set to show indicators for uncompleted time entries. +if ($user->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']); + } } $smarty->assign('active_users', $active_users); $smarty->assign('inactive_users', $inactive_users); $smarty->assign('can_delete_manager', $can_delete_manager); -$smarty->assign('title', $i18n->getKey('title.users')); +$smarty->assign('title', $i18n->get('title.users')); $smarty->assign('content_page_name', 'mobile/users.tpl'); $smarty->display('mobile/index.tpl');