X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=0a104888486f0e04930565a3d164a6ca1cb62cd2;hb=182ed39acb3600d991ff4742848a75c5ed2ba728;hp=e0bbbe5acf2d82e1b1ae75524850c455a850f13c;hpb=6b1d36d49ecb821678978322df9754ce23bb0359;p=timetracker.git diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index e0bbbe5a..0a104888 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -32,6 +32,7 @@ class ttUser { var $id = null; // User id. var $team_id = null; // Team id. var $role_id = null; // Role id. + var $role_name = null; // Role name. 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. @@ -71,7 +72,7 @@ class ttUser { $mdb2 = getConnection(); - $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role_id, r.rank, r.rights, u.client_id, u.email, t.name as team_name, + $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role_id, r.rank, r.name as role_name, r.rights, 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 @@ -94,6 +95,7 @@ class ttUser { $this->id = $val['id']; $this->team_id = $val['team_id']; $this->role_id = $val['role_id']; + $this->role_name = $val['role_name']; $this->rights = explode(',', $val['rights']); $this->is_client = !in_array('track_own_time', $this->rights); $this->rank = $val['rank'];