Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v
diff -u -r1.24.2.12 -r1.24.2.13
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	25 Nov 2004 01:16:08 -0000	1.24.2.12
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	20 Dec 2004 19:48:30 -0000	1.24.2.13
@@ -193,11 +193,16 @@
 
 set log_url [export_vars -base "${logger_url}log" {{return_url $return_url} {project_id $logger_project} {pm_project_id $task_info(project_item_id)} {pm_task_id $task_id}}]
 
-set assignee_add_self_widget "Add myself as <form method=\"post\" action=\"task-assign-add\">[export_vars -form {{task_item_id $task_id} user_id return_url}][pm::role::select_list -select_name "role_id"]<input type=\"Submit\" value=\"OK\" /></form>"
+set assignee_add_self_widget "Add myself as <form method=\"post\" action=\"task-assign-add\">[export_vars -form {{task_item_id $task_id} user_id return_url}][pm::role::task_select_list -select_name "role_id" -task_item_id $task_id -party_id $user_id]<input type=\"Submit\" value=\"OK\" /></form>"
 
-set assignee_remove_self_url [export_vars -base task-assign-remove {{task_item_id $task_id} user_id return_url}]
+# Only need a 'remove myself' link if you are already assigned
+set assigned_p [pm::task::assigned_p -task_item_id $task_id -party_id $user_id]
+if {$assigned_p} {
+    set assignee_remove_self_url [export_vars -base task-assign-remove {{task_item_id $task_id} user_id return_url}]
+}
 
 
+
 set nextyear_ansi [clock format [clock scan "+ 365 day"] -format "%Y-%m-%d"]
 set then_ansi [clock format [clock scan "-$logger_days days"] -format "%Y-%m-%d"]