Index: openacs-4/contrib/packages/project-manager/www/log-bulk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/log-bulk.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/contrib/packages/project-manager/www/log-bulk.tcl	8 Sep 2004 19:44:44 -0000	1.2.2.2
+++ openacs-4/contrib/packages/project-manager/www/log-bulk.tcl	20 Dec 2004 18:32:07 -0000	1.2.2.3
@@ -11,7 +11,7 @@
 
     @param item_id A multiple containing the task item_ids
 } {
-    task_id:multiple
+    task_item_id:multiple
     {return_url ""}
 } -properties {
 } -validate {
Index: openacs-4/contrib/packages/project-manager/www/tasks-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks-oracle.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/contrib/packages/project-manager/www/tasks-oracle.xql	22 Oct 2004 04:28:37 -0000	1.1.2.1
+++ openacs-4/contrib/packages/project-manager/www/tasks-oracle.xql	20 Dec 2004 18:32:07 -0000	1.1.2.2
@@ -4,8 +4,7 @@
 
 <fullquery name="tasks">
     <querytext>
-        SELECT ts.task_id,
-               ts.task_id as item_id,
+        SELECT ts.task_id as task_item_id,
                ts.task_number,
                t.task_revision_id,
                t.title,
Index: openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks-postgresql.xql,v
diff -u -r1.5.2.5 -r1.5.2.6
--- openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql	10 Dec 2004 19:05:10 -0000	1.5.2.5
+++ openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql	20 Dec 2004 18:32:07 -0000	1.5.2.6
@@ -5,8 +5,7 @@
 <fullquery name="tasks">
     <querytext>
         SELECT
-        ts.task_id,
-        ts.task_id as item_id,
+        ts.task_id as task_item_id,
         ts.task_number,
         t.task_revision_id,
         t.title,
Index: openacs-4/contrib/packages/project-manager/www/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.tcl,v
diff -u -r1.5.2.14 -r1.5.2.15
--- openacs-4/contrib/packages/project-manager/www/tasks.tcl	10 Dec 2004 19:05:10 -0000	1.5.2.14
+++ openacs-4/contrib/packages/project-manager/www/tasks.tcl	20 Dec 2004 18:32:07 -0000	1.5.2.15
@@ -110,7 +110,7 @@
         label "\#"
         link_url_col item_url
         link_html { title "View this project version" }
-        display_template {<a href="@tasks.item_url@">@tasks.task_id@</a>}
+        display_template {<a href="@tasks.item_url@">@tasks.task_item_id@</a>}
     } 
     title {
         label "Subject"
@@ -168,7 +168,7 @@
 template::list::create \
     -name tasks \
     -multirow tasks \
-    -key task_id \
+    -key task_item_id \
     -elements $elements \
     -actions [list "Add task" [export_vars -base task-select-project {return_url}] "Add a task"] \
     -bulk_actions {
@@ -264,9 +264,9 @@
 
 db_multirow -extend { item_url latest_start_pretty latest_finish_pretty slack_time log_url hours_remaining days_remaining} tasks tasks {
 } {
-    set item_url [export_vars -base "task-one" {task_id}]
+    set item_url [export_vars -base "task-one" {{task_id $task_item_id}}]
 
-    set log_url [export_vars -base "${logger_url}log" {{project_id $logger_project} {pm_task_id $task_id} {pm_project_id $project_item_id} {return_url $return_url}}]
+    set log_url [export_vars -base "${logger_url}log" {{project_id $logger_project} {pm_task_id $task_item_id} {pm_project_id $project_item_id} {return_url $return_url}}]
 
     set latest_start_pretty [lc_time_fmt $latest_start "%x"]
     set latest_finish_pretty [lc_time_fmt $latest_finish "%x"]