Started populating org_id in projects and tasks.

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index e732b9890ba47d754834ea2298e1a880b937dc19..350b0c1ff8c26f6d8deca367cd704f08bd192f33 100644 (file)
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -184,6 +184,7 @@ class ttImportHelper {
       $this->taskMap[$this->currentElement['ID']] =
         ttTaskHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'description' => $this->currentElement['DESCRIPTION'],
           'status' => $this->currentElement['STATUS']));
@@ -198,6 +199,7 @@ class ttImportHelper {
       $this->projectMap[$this->currentElement['ID']] =
         ttProjectHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'description' => $this->currentElement['DESCRIPTION'],
           'tasks' => $mapped_tasks,

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 9203b560768cdea101faf828535e2932722f3cce..72b7171174d82a5e72905f149482aa8a866c0e53 100644 (file)
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -189,6 +189,7 @@ class ttProjectHelper {
     $mdb2 = getConnection();
 
     $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
 
     $name = $fields['name'];
     $description = $fields['description'];
@@ -197,8 +198,8 @@ class ttProjectHelper {
     $comma_separated = implode(',', $tasks); // This is a comma-separated list of associated task ids.
     $status = $fields['status'];
     
-    $sql = "insert into tt_projects (group_id, name, description, tasks, status)
-      values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_projects (group_id, org_id, name, description, tasks, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;

diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index b02271b9537fd981c3b4850233624111a98713e3..b4644d5131cc182fbae4e7507a15e7e9b6160cc4 100644 (file)
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -136,13 +136,14 @@ class ttTaskHelper {
     $mdb2 = getConnection();
 
     $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
     $name = $fields['name'];
     $description = $fields['description'];
     $projects = $fields['projects'];
     $status = $fields['status'];
         
-    $sql = "insert into tt_tasks (group_id, name, description, status)
-      values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_tasks (group_id, org_id, name, description, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     $last_id = 0;
     if (is_a($affected, 'PEAR_Error'))

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f36602e581347a5781826a1911268426d1c86612..8da3be0e6e1c884631d2e056cf6aba3bb1ce9e56 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.10.4382 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.10.4383 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/dbinstall.php b/dbinstall.php
index a4a6eba71f3a59362c9f317dfb7c10fe2deba936..e77c24b91ea4fd9ee06fb4e875d10828f260e8d9 100644 (file)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -977,6 +977,8 @@ if ($_POST) {
     setChange("ALTER TABLE `tt_projects` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("ALTER TABLE `tt_tasks` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.10', modified = now() where param_name = 'version_db' and param_value = '1.18.09'");
+    setChange("UPDATE `tt_projects` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
+    setChange("UPDATE `tt_tasks` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
   }
 
   if ($_POST["cleanup"]) {

diff --git a/mobile/project_add.php b/mobile/project_add.php
index b0d5394d46db844053fe7db083399a4e332d2ba2..6d68a178e5164d95130d0af7fb0d3fcb1db2a166 100644 (file)
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -78,7 +78,8 @@ if ($request->isPost()) {
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
       if (ttProjectHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,

diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 94f3e514de4aba33df7c2db22b866ad1d0b2525f..defec7add54c63d9d347f68a4c416b6a74d070e6 100644 (file)
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -119,7 +119,8 @@ if ($request->isPost()) {
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
         if (ttProjectHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,

diff --git a/mobile/task_add.php b/mobile/task_add.php
index 4b257edc5f4e3a48c1dcea14f7a1260703fbc914..796c725c9bb6cbf418c8784fcc872437dd1f7746 100644 (file)
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -68,7 +68,8 @@ if ($request->isPost()) {
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'status' => ACTIVE,

diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index f1e2568921a551d558441f0c9acd65e71df5a342..030cacd1bfb4d06f9d1b40633dd61896208ccd8b 100644 (file)
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -103,7 +103,8 @@ if ($request->isPost()) {
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,

diff --git a/project_add.php b/project_add.php
index 980870250b260aae092f0580d744186c255208f7..3b4c73d36415af2de6b24f0c87a6b22d86b0809d 100644 (file)
--- a/project_add.php
+++ b/project_add.php
@@ -77,7 +77,8 @@ if ($request->isPost()) {
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
       if (ttProjectHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,

diff --git a/project_edit.php b/project_edit.php
index 14e8e77134c4bfec03df3e524fe6cbc8e6e0fb42..77312b0b2b38a6576fab61ce5c70de39ac4eb084 100644 (file)
--- a/project_edit.php
+++ b/project_edit.php
@@ -118,7 +118,8 @@ if ($request->isPost()) {
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
         if (ttProjectHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,

diff --git a/task_add.php b/task_add.php
index e25fa39083a2712f8fbe92c97862ed34b17b3b92..383a3935a3849c9330bc5a5c153510817411bbb9 100644 (file)
--- a/task_add.php
+++ b/task_add.php
@@ -68,7 +68,8 @@ if ($request->isPost()) {
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'status' => ACTIVE,

diff --git a/task_edit.php b/task_edit.php
index feff4e52de5221bdbaabdeb88b4a9341d0388e59..e6381731380495b1adbe50757c3cac5d4bcab36d 100644 (file)
--- a/task_edit.php
+++ b/task_edit.php
@@ -101,7 +101,8 @@ if ($request->isPost()) {
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,