More work on roles revamp. Removed rights_mask from User class.

[timetracker.git] / user_edit.php

diff --git a/user_edit.php b/user_edit.php
index f890282de7c93917409d6ff5f55579d9a4a7ae72..92d27eaa2a5b462661f949cb5e73097e87660324 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();
 }


@@ -192,10 +192,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_mask && $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;
       }