class CustomFields {
// Definitions of custom field types.
+ const ENTITY_TIME = 1; // Field is associated with time entries.
+ const ENTITY_USER = 2; // Field is associated with users.
+ const ENTITY_PROJECT = 3; // Field is associated with projects.
const TYPE_TEXT = 1; // A text field.
const TYPE_DROPDOWN = 2; // A dropdown field with pre-defined values.
var $options = array(); // Array of options for a dropdown custom field.
// Constructor.
- function __construct($group_id) {
+ function __construct() {
+ global $user;
$mdb2 = getConnection();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
// Get fields.
- $sql = "select id, type, label, required from tt_custom_fields where group_id = $group_id and status = 1 and type > 0";
+ $sql = "select id, type, label, required from tt_custom_fields".
+ " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
// If we have a dropdown obtain options for it.
if ((count($this->fields) > 0) && ($this->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)) {
- $sql = "select id, value from tt_custom_field_options where field_id = ".$this->fields[0]['id']." and status = 1 order by value";
+ $sql = "select id, value from tt_custom_field_options".
+ " where field_id = ".$this->fields[0]['id']." and group_id = $group_id and org_id = $org_id and status = 1 order by value";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
$org_id = $user->org_id;
$sql = "select value from tt_custom_field_options".
- " where id = $id and group_id = $group_id and org_id = $org_id";
+ " where id = $id and group_id = $group_id and org_id = $org_id and status = 1";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
$org_id = $user->org_id;
$fields = array();
- $sql = "select id, type, label from tt_custom_fields".
+ $sql = "select id, entity_type, type, label from tt_custom_fields".
" where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
- $fields[] = array('id'=>$val['id'],'type'=>$val['type'],'label'=>$val['label']);
+ $fields[] = $val;
}
return $fields;
}
}
// The insertField inserts a custom field for group.
- static function insertField($field_name, $field_type, $required) {
+ static function insertField($field_name, $entity_type, $field_type, $required) {
global $user;
$mdb2 = getConnection();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- $sql = "insert into tt_custom_fields (group_id, org_id, type, label, required, status)".
- " values($group_id, $org_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
+ $sql = "insert into tt_custom_fields (group_id, org_id, entity_type, type, label, required, status)".
+ " values($group_id, $org_id, $entity_type, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}