X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=users.php;h=47ec0145aea1204e7d697573f6e6bc3d49066ebb;hb=35727570b2274aca4f0d816372dabfc93d00cf2d;hp=4afd5521f2cd802d8d6a64f5434c52ed591792b8;hpb=39bde74f3805057f70c81494e04e460f9b3b59dd;p=timetracker.git diff --git a/users.php b/users.php index 4afd5521..47ec0145 100644 --- a/users.php +++ b/users.php @@ -48,8 +48,9 @@ if ($request->isPost()) { $group_id = $request->getParameter('group'); $user->setOnBehalfGroup($group_id); } else { - $group_id = $user->getActiveGroup(); + $group_id = $user->getGroup(); } +$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators'); $form = new Form('usersForm'); if ($user->can('manage_subgroups')) { @@ -79,12 +80,12 @@ if($user->can('manage_users')) { $inactive_users = $user->getUsers($options); } -// Check if the group is set to show indicators for uncompleted time entries. -if ($user->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']); } + $smarty->assign('uncompleted_indicators', true); } $smarty->assign('forms', array($form->getName()=>$form->toArray()));