Fixed user edit.

[timetracker.git] / WEB-INF / lib / ttUser.class.php

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index b340c7b..61d8813 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -31,7 +31,9 @@ class ttUser {
   var $name = null;             // User name.
   var $id = null;               // User id.
   var $team_id = null;          // Team id.
-  var $role = null;             // User role (user, client, comanager, manager, admin).
+  var $role = null;             // User role (user, client, comanager, manager, admin). TODO: remove when new roles are done.
+  var $role_id = null;          // Role id.
+  var $rank = null;             // User role rank.
   var $client_id = null;        // Client id for client user role.
   var $behalf_id = null;        // User id, on behalf of whom we are working.
   var $behalf_name = null;      // User name, on behalf of whom we are working.
@@ -70,11 +72,11 @@ class ttUser {
 
     $mdb2 = getConnection();
 
-    $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.client_id, u.email, t.name as team_name, 
+    $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.role_id, r.rank, u.client_id, u.email, t.name as team_name,
       t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
       t.tracking_mode, t.project_required, t.task_required, t.record_type,
       t.bcc_email, t.plugins, t.config, t.lock_spec, t.workday_minutes, t.custom_logo
-      FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE ";
+      FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
     else
@@ -93,6 +95,14 @@ class ttUser {
       $this->id = $val['id'];
       $this->team_id = $val['team_id'];
       $this->role = $val['role'];
+      $this->role_id = $val['role_id'];
+      $this->rank = $val['rank'];
+      // Downgrade rank to legacy role, if it is still in use.
+      if ($this->role > 0 && $this->rank > $this->role)
+        $this->rank = $this->role; // TODO: remove after roles revamp.
+      // Upgrade rank from legacy role, for user who does not yet have a role_id.
+      if (!$this->rank && !$this->role_id && $this->role > 0)
+        $this->rank = $this->role; // TODO: remove after roles revamp.
       $this->client_id = $val['client_id'];
       $this->email = $val['email'];
       $this->lang = $val['lang'];
@@ -132,18 +142,27 @@ class ttUser {
       if ($this->role == ROLE_USER) {
         $this->rights = right_data_entry|right_view_charts|right_view_reports;
         // TODO: get customized rights from the database instead.
-        $this->rights_array[] = "data_entry";       // Right to enter time and expense records into Time Tracker.
-        $this->rights_array[] = "view_own_reports"; // Right to view own reports (for a specific user).
-        $this->rights_array[] = "view_own_charts";  // Right to view own charts (for a specific user).
+        // $this->rights_array[] = "data_entry";          // Enter time and expense records into Time Tracker.
+        // $this->rights_array[] = "view_own_data";       // View own reports and charts.
+        // $this->rights_array[] = "manage_own_settings"; // Edit own settings.
+        // $this->rights_array[] = "view_users";          // View user names and roles in a group.
       } elseif ($this->role == ROLE_CLIENT) {
         $this->rights = right_view_reports|right_view_invoices; // TODO: how about right_view_charts, too?
-        $this->rights_array[] = "view_client_reports";  // Right to view reports for a specific client.
-        $this->rights_array[] = "view_client_charts";   // Right to view charts for a specific client.
-        $this->rights_array[] = "view_client_invoices"; // Right to view invoices for a specific client.
+        // $this->rights_array[] = "view_own_data";       // View own reports, charts, and invoices.
+        // $this->rights_array[] = "manage_own_settings"; // Edit own settings.
       } elseif ($this->role == ROLE_COMANAGER) {
         $this->rights = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team;
+        // $this->rights_array[] = "data_entry";          // Enter time and expense records into Time Tracker.
+        // $this->rights_array[] = "view_own_data";       // View own reports and charts.
+        // $this->rights_array[] = "manage_own_settings"; // Edit own settings.
+        // $this->rights_array[] = "view_users";          // View user names and roles in a group.
+        // $this->rights_array[] = "on_behalf_data_entry";// Can enter data on behalf of lower roles.
+        // $this->rights_array[] = "view_data";           // Can view data for lower roles.
+        $this->rights_array[] = "override_punch_mode"; // Can input any start and finish times for self and lower roles.
+        // TODO: get rights from the database instead.
       } elseif ($this->role == ROLE_MANAGER) {
         $this->rights = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team|right_assign_roles|right_export_team;
+        $this->rights_array[] = "override_punch_mode"; // Can input any start and finish times for self and lower roles.
       } elseif ($this->role == ROLE_SITE_ADMIN) {
         $this->rights = right_administer_site;
       }
@@ -173,10 +192,6 @@ define('ROLE_COMANAGER', 68);    // Team co-manager. Can do many things but not
 define('ROLE_MANAGER', 324);     // Team manager. Can do everything for a team.
 define('ROLE_SITE_ADMIN', 1024); // Site administrator.
 */
-
-      // Adjust punch_mode for managers as they are allowed to overwrite start and end times.
-      // TODO: because of this we currently have a bug on the Team Profile page with "Punch mode" checkbox always off.
-      if ($this->canManageTeam()) $this->punch_mode = 0;
     }
   }