X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=users.php;h=79f2df3e6c52bfe5c4a58f122223ad0cc2201420;hb=c138ab042a599beb780895e5a5f54a1b287d67ae;hp=354ea1d692f6b33843e09eef136327ec0455861b;hpb=e3ed046e205a14772a8157def21fea9a14acdde8;p=timetracker.git diff --git a/users.php b/users.php index 354ea1d6..79f2df3e 100644 --- a/users.php +++ b/users.php @@ -30,9 +30,10 @@ require_once('initialize.php'); import('form.Form'); import('ttTeamHelper'); import('ttTimeHelper'); +import('ttRoleHelper'); // Access check. -if (!ttAccessCheck(right_data_entry)) { +if (!ttAccessAllowed('view_users')) { header('Location: access_denied.php'); exit(); } @@ -40,6 +41,12 @@ 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); }