X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=users.php;h=3fc266775d68ff0d7a487635ec221c26dc4a1620;hb=08bbf671649fd5419fe4d38fab621e053472e8ce;hp=cd60b893b4c3e76781d3facb6046926ba872516b;hpb=23ab58c659b527891568a385d8762bf3e6561adf;p=timetracker.git

diff --git a/users.php b/users.php
index cd60b893..3fc26677 100644
--- a/users.php
+++ b/users.php
@@ -30,6 +30,7 @@ require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
 import('ttTimeHelper');
+import('ttRoleHelper');
 
 // Access check.
 if (!ttAccessCheck(right_data_entry)) {
@@ -40,16 +41,22 @@ if (!ttAccessCheck(right_data_entry)) {
 // Get users.
 $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
 if($user->canManageTeam()) {
+
+  // If there are no roles in team, introduce default ones.
+  if (!ttRoleHelper::rolesExist()) ttRoleHelper::createDefaultRoles(); // TODO: refactor or remove after roles revamp.
+  // This is here temporarily so that we have roles to work with to manage users.
+  // Normally, this should be done during an upgrade step (not yet implemented).
+
   $can_delete_manager = (1 == count($active_users));
   $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true);
 }
 
-// Check each active user if they have an uncompleted time entry.
-foreach ($active_users as $key => $user) {
-  // Turn value from database into boolean.
-  $has_uncompleted_entry = (bool) ttTimeHelper::getUncompleted($user['id']);
-  // Add to current user in $active_users array.
-  $active_users[$key]['has_uncompleted_entry'] = $has_uncompleted_entry;
+// 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);