Populating org_id in tt_custom_fields table.

[timetracker.git] / plugins / CustomFields.class.php

diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index afb59dae941cc47286e815392dbad09ed9a191ee..57f1d86c6a8b4d5b05e6c62a415daebc4fcfaeca 100644 (file)
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -33,7 +33,7 @@ class CustomFields {
   const TYPE_TEXT = 1;     // A text field.
   const TYPE_DROPDOWN = 2; // A dropdown field with pre-defined values.
 
   const TYPE_TEXT = 1;     // A text field.
   const TYPE_DROPDOWN = 2; // A dropdown field with pre-defined values.
 

-  var $fields = array();  // Array of custom fields for team.
+  var $fields = array();  // Array of custom fields for group.

   var $options = array(); // Array of options for a dropdown custom field.
 
   // Constructor.
   var $options = array(); // Array of options for a dropdown custom field.
 
   // Constructor.


@@ -223,7 +223,7 @@ class CustomFields {
     return false;
   }
 
     return false;
   }
 

-  // getFields returns an array of custom fields for team.
+  // getFields returns an array of custom fields for group.

   static function getFields() {
     global $user;
     $mdb2 = getConnection();
   static function getFields() {
     global $user;
     $mdb2 = getConnection();


@@ -270,16 +270,19 @@ class CustomFields {
     return false;
   }
 
     return false;
   }
 

-  // The insertField inserts a custom field for team.
+  // The insertField inserts a custom field for group.

   static function insertField($field_name, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();
   static function insertField($field_name, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();

-    $sql = "insert into tt_custom_fields (group_id, type, label, required, status) values($user->group_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
+    $group_id = $user->getActiveGroup();
+    $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)";

     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 

-  // The updateField updates custom field for team.
+  // The updateField updates custom field for group.

   static function updateField($id, $name, $type, $required) {
     global $user;
     $mdb2 = getConnection();
   static function updateField($id, $name, $type, $required) {
     global $user;
     $mdb2 = getConnection();


@@ -288,7 +291,7 @@ class CustomFields {
     return (!is_a($affected, 'PEAR_Error'));
   }
 
     return (!is_a($affected, 'PEAR_Error'));
   }
 

-  // The deleteField deletes a custom field, its options and log entries for team.
+  // The deleteField deletes a custom field, its options and log entries for group.

   static function deleteField($field_id) {
 
     // Our overall intention is to keep the code simple and manageable.
   static function deleteField($field_id) {
 
     // Our overall intention is to keep the code simple and manageable.