X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=roles.php;h=64a1ee4a983a3dd86cadd3d229d948162a786bcb;hb=75b65e92b21d45e2b09fb12daef169fb214a7acd;hp=b4facce1cfd7efcb808b801bb0756c5f6061cf58;hpb=fe40891a4ad16b5b70d518e8b5b2596267b684f9;p=timetracker.git

diff --git a/roles.php b/roles.php
index b4facce1..64a1ee4a 100644
--- a/roles.php
+++ b/roles.php
@@ -32,16 +32,13 @@ import('ttTeamHelper');
 import('ttRoleHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 }
 
-// If there are no roles in team, introduce default ones.
-if (!ttRoleHelper::rolesExist()) ttRoleHelper::createDefaultRoles(); // TODO: refactor or remove after roles revamp.
-
-$smarty->assign('active_roles', ttTeamHelper::getActiveRoles($user->team_id));
-$smarty->assign('inactive_roles', ttTeamHelper::getInactiveRoles($user->team_id));
+$smarty->assign('active_roles', ttTeamHelper::getActiveRolesForUser());
+$smarty->assign('inactive_roles', ttTeamHelper::getInactiveRolesForUser());
 $smarty->assign('title', $i18n->getKey('title.roles'));
 $smarty->assign('content_page_name', 'roles.tpl');
 $smarty->display('index.tpl');