ttOrgImportHelper class impoved to output conflicting login names.

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

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 83b93a7..30c78f9 100644 (file)
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -168,7 +168,7 @@ class ttAdmin {
     // If we mark all of them deleted here, we can't recover nicely
     // as we'll lose track of what was deleted by user.
     //
-    // 2) DB maintenance script (Clean up DB from inactive teams) should
+    // 2) DB maintenance script (Clean up DB from inactive groups) should
     // get rid of these items permanently eventually.
 
     // Mark group deleted.
@@ -189,7 +189,7 @@ class ttAdmin {
     $result = true;
 
     if (!ttValidString($fields['group_name'], true)) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
       $result = false;
     }
     if (!ttValidString($fields['user_name'])) {
@@ -332,4 +332,24 @@ class ttAdmin {
 
     return true;
   }
+
+  // getGroupDetails obtains group name and its top manager details.
+  function getGroupDetails($group_id) {
+    $result = array();
+    $mdb2 = getConnection();
+
+    $sql = "select g.name as group_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email".
+      " from tt_groups g".
+      " inner join tt_users u on (u.group_id = g.id)".
+      " inner join tt_roles r on (r.id = u.role_id and r.rank = 512)".
+      " where g.id = $group_id";
+
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return $val;
+    }
+
+    return false;
+  }
 }