Index: openacs-4/packages/project-manager/lib/categories-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/categories-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/categories-portlet.tcl	26 May 2005 09:34:27 -0000	1.1
+++ openacs-4/packages/project-manager/lib/categories-portlet.tcl	6 Jun 2005 07:56:13 -0000	1.2
@@ -10,8 +10,8 @@
 # categories
 
 set categories [list]
-set cat_list [category::get_mapped_categories $project_item_id]
+set cat_list [category::get_mapped_categories $item_id]
 foreach cat $cat_list {
     lappend categories [category::get_name $cat]
 }
-set cat_length [llength $categories]
\ No newline at end of file
+set cat_length [llength $categories]
Index: openacs-4/packages/project-manager/www/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/add-edit.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/project-manager/www/add-edit.tcl	5 Jun 2005 00:11:05 -0000	1.8
+++ openacs-4/packages/project-manager/www/add-edit.tcl	6 Jun 2005 07:56:13 -0000	1.9
@@ -150,7 +150,7 @@
     if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
         ad_form -extend -name add_edit -form {
             {category_ids:integer(category),multiple {label "[_ project-manager.Categories]"}
-                {html {size 7}} {value {$project_item_id $package_id}}
+                {html {size 7}} {value {$project_id $package_id}}
             }
         }
     }
@@ -253,7 +253,7 @@
 		-send_email_p "f"
 
 	    if {[exists_and_not_null category_ids]} {
-		category::map_object -remove_old -object_id $project_item_id $category_ids
+		category::map_object -object_id $project_id $category_ids
 	    }
 
 	    callback pm::project_new -package_id $package_id -project_id $project_item_id -data [array get callback_data]
@@ -281,7 +281,7 @@
 	    set project_item_id [pm::project::get_project_item_id -project_id $project_id]
 
 	    if {[exists_and_not_null category_ids]} {
-		category::map_object -remove_old -object_id $project_item_id $category_ids
+		category::map_object -object_id $project_id $category_ids
 	    }
 	    callback pm::project_edit -package_id $package_id -project_id $project_item_id -data [array get callback_data]
 	}
Index: openacs-4/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/www/one.adp	26 May 2005 12:44:08 -0000	1.5
+++ openacs-4/packages/project-manager/www/one.adp	6 Jun 2005 07:56:13 -0000	1.6
@@ -28,8 +28,7 @@
   <p />
   <include
     src="/packages/project-manager/lib/categories-portlet"
-    project_id="@project_id@"
-    project_item_id="@project_item_id@" />
+    item_id="@project_id@" />
   <p />
   <if @use_subprojects_p@>
     <include
Index: openacs-4/packages/project-manager/www/task-add-edit-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-add-edit-one.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/project-manager/www/task-add-edit-one.tcl	6 Jun 2005 07:39:50 -0000	1.7
+++ openacs-4/packages/project-manager/www/task-add-edit-one.tcl	6 Jun 2005 07:56:13 -0000	1.8
@@ -543,7 +543,7 @@
         }
 
 	if {[exists_and_not_null category_ids]} {
-	    category::map_object -remove_old -object_id $task_id $category_ids
+	    category::map_object -object_id $task_id $category_ids
 	}
 
 	callback pm::task_new -package_id $package_id -task_id $task_item_id
@@ -638,7 +638,7 @@
         }
 
 	if {[exists_and_not_null category_ids]} {
-	    category::map_object -remove_old -object_id $task_id $category_ids
+	    category::map_object -object_id $task_id $category_ids
 	}
 
 	callback pm::task_edit -package_id $package_id -task_id $task_item_id
Index: openacs-4/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-one.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/www/task-one.adp	3 Jun 2005 22:13:44 -0000	1.4
+++ openacs-4/packages/project-manager/www/task-one.adp	6 Jun 2005 07:56:13 -0000	1.5
@@ -131,11 +131,14 @@
 
               </table>
               <td class="list-right-bg">&nbsp</td>
-
         </table>
         
         <P />
         
+  <include
+    src="/packages/project-manager/lib/categories-portlet"
+    item_id="@task_revision_id@" />
+
         <if 0 eq 1>
           <if @notification_chunk@ not nil>
             @notification_chunk;noquote@