X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTeamHelper.class.php;h=4e39628a2e1c1e4cb1cdc1745152bab88053f826;hb=7218f84ad58ed22a926b3ffa7a152ca7f93f0204;hp=684fa63c53fcaae5384a682068cf0a91df861286;hpb=813f43a9406fb5adfb8c6e89cd97b06a11da58c9;p=timetracker.git

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 684fa63c..4e39628a 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -71,10 +71,11 @@ class ttTeamHelper {
   // The getActiveUsers obtains all active users in a given team.
   static function getActiveUsers($options = null) {
     global $user;
+    global $i18n;
     $mdb2 = getConnection();
 
     if (isset($options['getAllFields']))
-      $sql = "select * from tt_users where team_id = $user->team_id and status = 1 order by upper(name)";
+      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.team_id = $user->team_id and u.status = 1 order by upper(u.name)";
     else
       $sql = "select id, name from tt_users where team_id = $user->team_id and status = 1 order by upper(name)";
     $res = $mdb2->query($sql);
@@ -82,6 +83,9 @@ class ttTeamHelper {
     if (is_a($res, 'PEAR_Error'))
       return false;
     while ($val = $res->fetchRow()) {
+      // Localize top manager role name, as it is not localized in db.
+      if ($val['rank'] == 512)
+        $val['role_name'] = $i18n->getKey('role.top_manager.label');
       $user_list[] = $val;
     }
 
@@ -121,7 +125,7 @@ class ttTeamHelper {
     $mdb2 = getConnection();
 
     if ($all_fields)
-      $sql = "select * from tt_users where team_id = $team_id and status = 0 order by upper(name)";
+      $sql = "select u.*, r.name as role_name from tt_users u left join tt_roles r on (u.role_id = r.id) where u.team_id = $team_id and u.status = 0 order by upper(u.name)";
     else
       $sql = "select id, name from tt_users where team_id = $team_id and status = 0 order by upper(name)";
     $res = $mdb2->query($sql);
@@ -698,7 +702,8 @@ class ttTeamHelper {
     $role_manager = ROLE_MANAGER;
     $sql = "select t.name as team_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email
       from tt_teams t
-      inner join tt_users u on (u.team_id = t.id and u.role = $role_manager)
+      inner join tt_users u on (u.team_id = t.id)
+      inner join tt_roles r on (r.id = u.role_id and r.rank = 512)
       where t.id = $team_id";
 
     $res = $mdb2->query($sql);