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 493b00ba24f49a06e0d6eb22d335da034b95cffe..92d27eaa2a5b462661f949cb5e73097e87660324 100644 (file)
--- a/user_edit.php
+++ b/user_edit.php
@@ -192,10 +192,11 @@ if ($request->isPost()) {
         '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;
+
         $fields['role_id'] = $cl_role;
         $fields['client_id'] = $cl_client_id;
       }