Index: openacs-4/packages/dotlrn-project-manager/tcl/dotlrn-project-manager-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-project-manager/tcl/dotlrn-project-manager-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-project-manager/tcl/dotlrn-project-manager-procs.tcl	10 Jun 2005 21:41:20 -0000	1.3
+++ openacs-4/packages/dotlrn-project-manager/tcl/dotlrn-project-manager-procs.tcl	14 Jun 2005 06:42:05 -0000	1.4
@@ -55,6 +55,8 @@
     # FIXME: won't work with multiple dotlrn instances Use the package_key
     # for the -url param - "/" are not allowed!
 
+    set package_id 0
+
     if {![dotlrn::is_package_mounted \
 	      -package_key [package_key]]} {
 	set package_id [dotlrn::mount_package \
@@ -63,7 +65,8 @@
 			    -directory_p "t"]
     }
 
-    dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key] -package_key [my_package_key]
+    dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key] -package_key [my_package_key] -package_id $package_id
+
 }
 
 ad_proc -public dotlrn_project_manager::remove_applet {
@@ -118,9 +121,9 @@
 
     # Add all portlets to the Portal.
 
-    project_manager_portlet::add_self_to_page -portal_id $portal_id -project_manager_id $package_id
+    project_manager_portlet::add_self_to_page -portal_id $portal_id -package_id $package_id -project_manager_id $package_id
 
-    project_manager_task_portlet::add_self_to_page -portal_id $portal_id -project_manager_id $package_id
+    project_manager_task_portlet::add_self_to_page -portal_id $portal_id  -package_id $package_id -project_manager_id $package_id
 
 
     # instantiate and mount the logger package for this pm
@@ -194,6 +197,27 @@
 } {
     Add a user to a community
 } {
+
+    set package_id [dotlrn_community::get_applet_package_id -community_id $community_id -applet_key [applet_key]]
+    set portal_id [dotlrn::get_portal_id -user_id $user_id]
+    
+    # use "append" here since we want to aggregate
+    set param_action append
+
+    # Add both portlets
+    project_manager_portlet::add_self_to_page \
+        -portal_id $portal_id \
+        -package_id $package_id \
+	-project_manager_id $package_id \
+        -param_action $param_action
+
+    project_manager_task_portlet::add_self_to_page \
+        -portal_id $portal_id \
+        -package_id $package_id \
+	-project_manager_id $package_id \
+        -param_action $param_action
+
+
 }
 
 ad_proc -public dotlrn_project_manager::remove_user_from_community {
@@ -211,7 +235,7 @@
 
     @param portal_id
 } {
-    project_manager_portlet::add_self_to_page -portal_id $portal_id -project_manager_id 0
+    project_manager_portlet::add_self_to_page -portal_id $portal_id -project_manager_id 0 -package_id 0
 
     #    add_portlet_helper $portal_id $args
 }
Index: openacs-4/packages/project-manager-portlet/tcl/project-manager-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/tcl/project-manager-portlet-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager-portlet/tcl/project-manager-portlet-procs.tcl	10 Jun 2005 21:43:10 -0000	1.2
+++ openacs-4/packages/project-manager-portlet/tcl/project-manager-portlet-procs.tcl	14 Jun 2005 06:42:05 -0000	1.3
@@ -50,6 +50,7 @@
     ad_proc -public add_self_to_page {
 	{-portal_id:required}
 	{-project_manager_id:required}
+	{-package_id:required}
         {-page_name ""}
         {-pretty_name ""}
         {-force_region ""}
@@ -92,9 +93,9 @@
                     -portlet_name [get_my_name] \
                     -pretty_name $pretty_name \
                     -force_region $force_region \
-                    -key project_manager_id \
-                    -value $project_manager_id \
-                    -param_action $param_action \
+                    -value $package_id \
+		    -key project_manager_id \
+		    -param_action $param_action \
                     -extra_params $extra_params
         ]
     }
@@ -122,6 +123,8 @@
 	 cf
     } {
     } {
+
+	
         portal::show_proc_helper \
             -package_key [my_package_key] \
             -config_list $cf
Index: openacs-4/packages/project-manager-portlet/tcl/project-manager-task-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/tcl/project-manager-task-portlet-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager-portlet/tcl/project-manager-task-portlet-procs.tcl	10 Jun 2005 18:27:34 -0000	1.1
+++ openacs-4/packages/project-manager-portlet/tcl/project-manager-task-portlet-procs.tcl	14 Jun 2005 06:42:05 -0000	1.2
@@ -50,7 +50,8 @@
     ad_proc -public add_self_to_page {
 	{-portal_id:required}
 	{-project_manager_id:required}
-        {-page_name ""}
+	{-package_id:required}
+	{-page_name ""}
         {-pretty_name ""}
         {-force_region ""}
 	{-scoped_p ""}
@@ -89,8 +90,7 @@
                     -portlet_name [get_my_name] \
                     -pretty_name $pretty_name \
                     -force_region $force_region \
-                    -key project_manager_id \
-                    -value $project_manager_id \
+                    -value $package_id \
                     -param_action $param_action \
                     -extra_params $extra_params
         ]