X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=users.php;h=2fbcb5d20e61e779b5f7f7db52f7af3d7ad559dd;hb=63de9ce903678e68402aee625f516e3ee2608fbb;hp=d19ba7de6f46a105b439fa1776c5cc41c6e667ff;hpb=f9e5e8956921839e6742a85db2067ddc6ef5b2b8;p=timetracker.git diff --git a/users.php b/users.php index d19ba7de..2fbcb5d2 100644 --- a/users.php +++ b/users.php @@ -39,29 +39,31 @@ 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); } $smarty->assign('active_users', $active_users); $smarty->assign('inactive_users', $inactive_users); +$smarty->assign('show_quota', $user->isPluginEnabled('mq')); $smarty->assign('title', $i18n->get('title.users')); $smarty->assign('content_page_name', 'users.tpl'); $smarty->display('index.tpl');