X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=user_edit.php;h=8e68583c17a5217e6973629785fb71c0af094e5c;hb=8d68ecdd7b1c45cb2a5cf592b8d504d7e4614911;hp=ec3341c279ef4f0c5d05c85133a2e4ba867703fd;hpb=08bbf671649fd5419fe4d38fab621e053472e8ce;p=timetracker.git

diff --git a/user_edit.php b/user_edit.php
index ec3341c2..8e68583c 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -36,7 +36,7 @@ import('form.TableColumn');
 import('ttRoleHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_users')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -95,11 +95,6 @@ if ($request->isPost()) {
   $cl_email = $user_details['email'];
   $cl_rate = str_replace('.', $user->decimal_mark, $user_details['rate']);
   $cl_role = $user_details['role_id'];
-
-  // In case role_id is not yet assigned...
-  if (!$cl_role && $user_details['role'])
-    $cl_role = ttRoleHelper::getRoleByRank($user_details['role']); // TODO: remove after roles revamp.
-  
   $cl_client_id = $user_details['client_id'];
   $cl_status = $user_details['status'];
   $cl_projects = array();
@@ -119,10 +114,6 @@ if (!$auth->isPasswordExternal()) {
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 300px;','value'=>$cl_email));
 
 $active_roles = ttTeamHelper::getActiveRolesForUser();
-//$roles[ROLE_USER] = $i18n->getKey('label.user');
-//$roles[ROLE_COMANAGER] = $i18n->getKey('form.users.comanager');
-//if ($user->isPluginEnabled('cl'))
-//  $roles[ROLE_CLIENT] = $i18n->getKey('label.client');
 $form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role,'data'=>$active_roles, 'datakeys'=>array('id', 'name')));
 if ($user->isPluginEnabled('cl'))
   $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
@@ -196,10 +187,11 @@ if ($request->isPost()) {
         'status' => $cl_status,
         'rate' => $cl_rate,
         'projects' => $assigned_projects);
-      if (right_assign_roles & $user->rights) {
+      if (in_array('manage_users', $user->rights) && $cl_role) {
         // Get legacy role value.
         $legacy_role = ttRoleHelper::getLegacyRole($cl_role); // TODO: remove after roles revamp.
         $fields['role'] = $legacy_role;
+
         $fields['role_id'] = $cl_role;
         $fields['client_id'] = $cl_client_id;
       }