X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/139889a67699143cce59a4f3136b3158058b9ce2..3eea3d000c2415bb7b36ab759a049420ca53ae2e:/users.php

diff --git a/users.php b/users.php
index 15850d24..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,12 +41,18 @@ 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 if the user wants to show uncompleted time entries.
-if (ENTRIES_USERS_PAGE == $user->uncompleted_entries) {
+// 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']);