X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=roles.php;h=fe68329d36c27caba68a48bac622e5850a6068e0;hb=46863f8e2310c275ec6d3b933d53717da711b05a;hp=44255812fd76de358573de6b3962265e27c9c803;hpb=983bd79a9542306ecbd0f1be372d7006e7b337e1;p=timetracker.git

diff --git a/roles.php b/roles.php
index 44255812..fe68329d 100644
--- a/roles.php
+++ b/roles.php
@@ -29,15 +29,28 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttRoleHelper');
 
-// Access check.
-if (!ttAccessCheck(right_manage_team)) {
+// Access checks.
+if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 }
+$group_id = (int)$request->getParameter('group_id');
+if ($group_id && !$user->isGroupValid($group_id)) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if ($group_id) {
+  // We are passed a valid group_id (most likely from group_edit.php).
+  // Set on behalf group accordingly.
+  $user->setOnBehalfGroup($group_id);
+}
 
-$smarty->assign('active_roles', ttTeamHelper::getActiveRoles($user->team_id));
-$smarty->assign('inactive_roles', ttTeamHelper::getInactiveRoles($user->team_id));
-$smarty->assign('title', $i18n->getKey('label.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');