X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=roles.php;h=cd17da3c48cc5aa9bd695a18822abb07a32708b9;hb=cdd2e058776a3d0dc9b6f32a2d5d33e4f9388491;hp=efeb495752c660132a1305dbcbc1c7a45c2ce3ec;hpb=b401022733a9645ed701522585b2d57db936f5cc;p=timetracker.git

diff --git a/roles.php b/roles.php
index efeb4957..cd17da3c 100644
--- a/roles.php
+++ b/roles.php
@@ -31,17 +31,15 @@ import('form.Form');
 import('ttTeamHelper');
 import('ttRoleHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
-// 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('title', $i18n->getKey('title.roles'));
+$smarty->assign('active_roles', ttTeamHelper::getActiveRolesForUser());
+$smarty->assign('inactive_roles', ttTeamHelper::getInactiveRolesForUser());
+$smarty->assign('title', $i18n->get('title.roles'));
 $smarty->assign('content_page_name', 'roles.tpl');
 $smarty->display('index.tpl');