Index: tasks.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tasks/tasks.install,v
retrieving revision 1.6
diff -u -p -r1.6 tasks.install
--- tasks.install	19 Mar 2007 15:55:16 -0000	1.6
+++ tasks.install	8 Apr 2007 23:24:24 -0000
@@ -7,7 +7,7 @@ function tasks_install() {
     drupal_set_message("Creating required tasks.module MySQL tables for first install");
     db_query("CREATE TABLE {tasks} (
       nid int(10) unsigned NOT NULL default '0',
-      parent int(10) unsigned NOT NULL default '0',
+      task_parent int(10) unsigned NOT NULL default '0',
       assigned_to int(10) unsigned NOT NULL default '0',
       order_by float unsigned NOT NULL default '0',
       completed date NOT NULL default '0000-00-00',
@@ -25,3 +25,9 @@ function tasks_update_1() {
   $ret[] = update_sql("UPDATE {permission} SET perm = REPLACE(perm, 'create task', 'create tasks') WHERE perm LIKE '%create task%'");
   return $ret;
 }
+
+function tasks_update_2() {
+  $items = array();
+  $items[] = update_sql("ALTER TABLE {tasks} CHANGE parent task_parent int(10) unsigned NOT NULL default '0'");
+  return $items;
+}
\ No newline at end of file
Index: tasks.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tasks/tasks.module,v
retrieving revision 1.12
diff -u -p -r1.12 tasks.module
--- tasks.module	19 Mar 2007 15:48:59 -0000	1.12
+++ tasks.module	8 Apr 2007 23:24:25 -0000
@@ -94,11 +94,11 @@ function tasks_form(&$node) {
   $form = array();
 
   // Get a list of tasklists to choose a parent tasklist
-  if (!isset($node->parent) || $node->parent != 0) {
-    $result = db_query("SELECT n.*, t.* FROM {node} n INNER JOIN {tasks} t ON n.nid = t.nid WHERE n.type='tasks' AND t.completed = '0000-00-00' ORDER BY IF(t.parent = 0,0,1), n.title ASC");
+  if (!isset($node->task_parent) || $node->task_parent != 0) {
+    $result = db_query("SELECT n.*, t.* FROM {node} n INNER JOIN {tasks} t ON n.nid = t.nid WHERE n.type='tasks' AND t.completed = '0000-00-00' ORDER BY IF(t.task_parent = 0,0,1), n.title ASC");
 
     while ($tasklist = db_fetch_object($result)) {
-      if ($tasklist->parent == 0) {
+      if ($tasklist->task_parent == 0) {
         $tasklist->title = t('-- MASTER TASKLIST --');
       }
       $tasklists[$tasklist->nid] = $tasklist->title;
@@ -106,20 +106,20 @@ function tasks_form(&$node) {
     }
     if (!$not_master) $tasklists[0] = t('NO PARENT - THIS IS THE MASTER TASKLIST');
 
-    if (isset($_GET['edit']['parent'])) {
-      $node->parent = $_GET['edit']['parent'];
+    if (isset($_GET['edit']['task_parent'])) {
+      $node->task_parent = $_GET['edit']['task_parent'];
     }
-    $form['parent'] = array(
+    $form['task_parent'] = array(
       '#type' => 'select',
       '#title' => t('Parent Tasklist'),
-      '#default_value' => $node->parent,
+      '#default_value' => $node->task_parent,
       '#options' => $tasklists,
       '#weight' => -10
     );
   }
   else {
     // parent tasklist
-    $form['parent'] = array(
+    $form['task_parent'] = array(
       '#type' => 'value',
       '#value' => 0
     );
@@ -177,8 +177,8 @@ function tasks_form(&$node) {
     '#value' => arg(3)
   );
 
-  if ($node->parent) {
-    $result = db_query("SELECT n.*, t.* FROM {node} n, {tasks} t WHERE n.type='tasks' AND t.nid = n.nid AND t.completed = '0000-00-00' AND t.parent = $node->parent ORDER BY t.order_by ASC");
+  if ($node->task_parent) {
+    $result = db_query("SELECT n.*, t.* FROM {node} n, {tasks} t WHERE n.type='tasks' AND t.nid = n.nid AND t.completed = '0000-00-00' AND t.task_parent = $node->task_parent ORDER BY t.order_by ASC");
 
     while ($tasklist = db_fetch_object($result)) {
       if ($tasklist->nid == $node->nid) {
@@ -251,7 +251,7 @@ function tasks_insert($node) {
     $node->completed_date['day'] = "00";
   }
 
-  db_query("INSERT INTO {tasks} (nid, parent, assigned_to, order_by, completed) VALUES (%d, %d, %d, '%s', '%s')", $node->nid, $node->parent, $node->assigned_to, $node->order_by, $node->completed_date['year'].'-'.$node->completed_date['month'].'-'.$node->completed_date['day']);
+  db_query("INSERT INTO {tasks} (nid, task_parent, assigned_to, order_by, completed) VALUES (%d, %d, %d, '%s', '%s')", $node->nid, $node->task_parent, $node->assigned_to, $node->order_by, $node->completed_date['year'].'-'.$node->completed_date['month'].'-'.$node->completed_date['day']);
   _tasks_order_by($node);
 }
 
@@ -266,7 +266,7 @@ function tasks_update($node) {
     $node->completed_date['day'] = "00";
   }
 
-  db_query("UPDATE {tasks} SET parent = %d, assigned_to = %d, order_by = '%s', completed = '%s' WHERE nid = %d", $node->parent, $node->assigned_to, $node->order_by, $node->completed_date['year'].'-'.$node->completed_date['month'].'-'.$node->completed_date['day'], $node->nid);
+  db_query("UPDATE {tasks} SET task_parent = %d, assigned_to = %d, order_by = '%s', completed = '%s' WHERE nid = %d", $node->task_parent, $node->assigned_to, $node->order_by, $node->completed_date['year'].'-'.$node->completed_date['month'].'-'.$node->completed_date['day'], $node->nid);
   _tasks_order_by($node);
 
   // Redirect to the tasks home page?
@@ -284,7 +284,7 @@ function tasks_delete($node) {
 
 // Implementation of hook_load().
 function tasks_load($node) {
-  $additions = db_fetch_object(db_query('SELECT parent, assigned_to, order_by, completed FROM {tasks} WHERE nid = %d', $node->nid));
+  $additions = db_fetch_object(db_query('SELECT task_parent, assigned_to, order_by, completed FROM {tasks} WHERE nid = %d', $node->nid));
 
   $additions->completed_date['year'] = substr($additions->completed,0,4);
   $additions->completed_date['month'] = substr($additions->completed,5,2);
@@ -346,8 +346,8 @@ function tasks_view(&$node, $teaser = FA
     }
 
     // Get the list of tasks to display
-    //$result = db_query("SELECT n.*, t.*, u.name AS assigned_name, u.data FROM {node} n INNER JOIN {tasks} t ON t.nid = n.nid LEFT JOIN {users} u ON u.uid = t.assigned_to WHERE n.status = 1 AND n.type='tasks' AND t.parent = %d %s ORDER BY %s", $node->nid, $complete, $order_by);
-    $result = db_query("SELECT n.nid, u.name AS assigned_name, u.data FROM {node} n INNER JOIN {tasks} t ON t.nid = n.nid LEFT JOIN {users} u ON u.uid = t.assigned_to WHERE n.status = 1 AND n.type='tasks' AND t.parent = %d %s ORDER BY %s", $node->nid, $complete, $order_by);
+    //$result = db_query("SELECT n.*, t.*, u.name AS assigned_name, u.data FROM {node} n INNER JOIN {tasks} t ON t.nid = n.nid LEFT JOIN {users} u ON u.uid = t.assigned_to WHERE n.status = 1 AND n.type='tasks' AND t.task_parent = %d %s ORDER BY %s", $node->nid, $complete, $order_by);
+    $result = db_query("SELECT n.nid, u.name AS assigned_name, u.data FROM {node} n INNER JOIN {tasks} t ON t.nid = n.nid LEFT JOIN {users} u ON u.uid = t.assigned_to WHERE n.status = 1 AND n.type='tasks' AND t.task_parent = %d %s ORDER BY %s", $node->nid, $complete, $order_by);
 
     $num_rows = db_num_rows($result);
 
@@ -429,11 +429,11 @@ function _tasks_main() {
 
 
   // Get the list of tasks to display
-  $result = db_query("SELECT t.* FROM {tasks} t WHERE t.parent = 0");
+  $result = db_query("SELECT t.* FROM {tasks} t WHERE t.task_parent = 0");
 
   if ($num_rows = db_num_rows($result)) {
     if ($num_rows != 1) {
-      drupal_set_message(t('WARNING: more than one master tasklists. Please delete all but one nodes of type tasks where parent = 0'));
+      drupal_set_message(t('WARNING: more than one master tasklists. Please delete all but one nodes of type tasks where task_parent = 0'));
       print theme('page','');
     }
     else {
@@ -460,7 +460,7 @@ function _tasks_main() {
 function _tasks_order_by($node) {
   // done either on insert or update of a task. we want to make order by values into integers to get in the updated one and remain consistent
 
-  $result = db_query("SELECT n.*, t.* FROM {node} n, {tasks} t WHERE n.type='tasks' AND t.nid  = n.nid AND t.order_by != 0 AND t.parent = %d ORDER BY t.order_by ASC", $node->parent);
+  $result = db_query("SELECT n.*, t.* FROM {node} n, {tasks} t WHERE n.type='tasks' AND t.nid  = n.nid AND t.order_by != 0 AND t.task_parent = %d ORDER BY t.order_by ASC", $node->task_parent);
 
   $i = 1;
   while ($task = db_fetch_object($result)) {