projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Started to populate tt_project_task_binds with group_id and org_id.
[timetracker.git]
/
WEB-INF
/
lib
/
ttGroupHelper.class.php
diff --git
a/WEB-INF/lib/ttGroupHelper.class.php
b/WEB-INF/lib/ttGroupHelper.class.php
index
22362b5
..
6ddffaa
100644
(file)
--- a/
WEB-INF/lib/ttGroupHelper.class.php
+++ b/
WEB-INF/lib/ttGroupHelper.class.php
@@
-30,35
+30,32
@@
// This is a planned replacement for ttTeamHelper as we move forward with subgroups.
class ttGroupHelper {
// This is a planned replacement for ttTeamHelper as we move forward with subgroups.
class ttGroupHelper {
- // The getTopGroups function returns an array of all active top groups on the server.
- static function getTopGroups() {
- $result = array();
+ // The getGroupName function returns group name.
+ static function getGroupName($group_id) {
$mdb2 = getConnection();
$mdb2 = getConnection();
- $sql = "select id, name, created, lang from tt_groups".
- " where status = 1 and org_id is NULL or org_id = id order by id desc";
+ $sql = "select name from tt_groups where id = $group_id and (status = 1 or status = 0)";
$res = $mdb2->query($sql);
$res = $mdb2->query($sql);
- $result = array();
+
if (!is_a($res, 'PEAR_Error')) {
if (!is_a($res, 'PEAR_Error')) {
- while ($val = $res->fetchRow()) {
- $val['date'] = substr($val['created'], 0, 10); // Strip the time.
- $result[] = $val;
- }
- return $result;
+ $val = $res->fetchRow();
+ return $val['name'];
}
return false;
}
}
return false;
}
- // The getGroupName function returns group name.
- static function getGroupName($group_id) {
+ // The getParentGroup determines a parent group for a given group.
+ static function getParentGroup($group_id) {
+ global $user;
+
$mdb2 = getConnection();
$mdb2 = getConnection();
- $sql = "select
name from tt_groups where id = $group_id and (status = 1 or status = 0)
";
+ $sql = "select
parent_id from tt_groups where id = $group_id and org_id = $user->org_id and status = 1
";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
- return $val['
name
'];
+ return $val['
parent_id
'];
}
return false;
}
}
return false;
}