Some cleanup and refactoring of role_id update.

[timetracker.git] / user_edit.php

diff --git a/user_edit.php b/user_edit.php
index a811c00b44e338dbea378cfddb186003fe9e2d66..8e68583c17a5217e6973629785fb71c0af094e5c 100644 (file)
--- a/user_edit.php
+++ b/user_edit.php
@@ -36,7 +36,7 @@ import('form.TableColumn');
 import('ttRoleHelper');
 
 // Access check.
 import('ttRoleHelper');
 
 // Access check.

-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_users')) {

   header('Location: access_denied.php');
   exit();
 }
   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'];
   $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();
   $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();
 $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'))));
 $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);
         'status' => $cl_status,
         'rate' => $cl_rate,
         'projects' => $assigned_projects);

-      if (right_assign_roles & $user->rights && $cl_role) {
+      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;
         // 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;
       }
         $fields['role_id'] = $cl_role;
         $fields['client_id'] = $cl_client_id;
       }