Version update.

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

diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 00582e3e9fe4f39f47c4a2c74fa9fff876902713..0e450b14dcff85fc33d71081dc591518bd1ca156 100644 (file)
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -63,9 +63,14 @@ class CustomFields {
   }
 
   function insert($log_id, $field_id, $option_id, $value) {
   }
 
   function insert($log_id, $field_id, $option_id, $value) {

-
+    global $user;

     $mdb2 = getConnection();
     $mdb2 = getConnection();

-    $sql = "insert into tt_custom_field_log (log_id, field_id, option_id, value) values($log_id, $field_id, ".$mdb2->quote($option_id).", ".$mdb2->quote($value).")";
+
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
+    $sql = "insert into tt_custom_field_log (group_id, org_id, log_id, field_id, option_id, value)".
+      " values($group_id, $org_id, $log_id, $field_id, ".$mdb2->quote($option_id).", ".$mdb2->quote($value).")";

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


@@ -110,9 +115,12 @@ class CustomFields {
 
   // insertOption adds a new option to a custom field.
   static function insertOption($field_id, $option_name) {
 
   // insertOption adds a new option to a custom field.
   static function insertOption($field_id, $option_name) {

-
+    global $user;

     $mdb2 = getConnection();
 
     $mdb2 = getConnection();
 

+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+

     // Check if the option exists.
     $id = 0;
     $sql = "select id from tt_custom_field_options where field_id = $field_id and value = ".$mdb2->quote($option_name);
     // Check if the option exists.
     $id = 0;
     $sql = "select id from tt_custom_field_options where field_id = $field_id and value = ".$mdb2->quote($option_name);


@@ -123,7 +131,8 @@ class CustomFields {
 
     // Insert option.
     if (!$id) {
 
     // Insert option.
     if (!$id) {

-      $sql = "insert into tt_custom_field_options (field_id, value) values($field_id, ".$mdb2->quote($option_name).")";
+      $sql = "insert into tt_custom_field_options (group_id, org_id, field_id, value)".
+        " values($group_id, $org_id, $field_id, ".$mdb2->quote($option_name).")";

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


@@ -274,7 +283,10 @@ class CustomFields {
   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'));
   }