Index: openacs-4/packages/project-manager/lib/task-assignee-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-assignee-portlet.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/project-manager/lib/task-assignee-portlet.tcl	12 Sep 2005 07:10:26 -0000	1.3
+++ openacs-4/packages/project-manager/lib/task-assignee-portlet.tcl	14 Sep 2005 22:15:28 -0000	1.4
@@ -41,7 +41,7 @@
                 "[_ project-manager.Who]"
             }
             display_template {
-                <if @people.is_lead_p@><i></if>@people.user_info@<if @people.is_lead_p@></i></if>
+                <if @people.is_lead_p@><i></if>@people.assign_name@<if @people.is_lead_p@></i></if>
             }
         }
         role_id {
@@ -60,14 +60,9 @@
     } \
     -orderby {
         default_value role_id,desc
-        first_names {
-            orderby_asc "first_names asc, last_name asc"
-            orderby_desc "first_names desc, last_name desc"
-            default_direction asc
-        }
         role_id {
-            orderby_asc "role_id asc, user_info asc"
-            orderby_desc "role_id desc, user_info asc"
+            orderby_asc "role_id asc"
+            orderby_desc "role_id desc"
             default_direction asc
         }
         default_value role_id,asc
@@ -77,4 +72,17 @@
         width 100%
     }
 
-db_multirow people task_people_query { }
+set assign_group_p [parameter::get -parameter "AssignGroupP" -default 0]
+
+if { $assign_group_p } {
+    set query_name "task_people_group_query"
+} else {
+    set query_name "task_people_query"
+}
+
+db_multirow -extend { assign_name } people $query_name { } {
+    set assign_name [db_string get_user_name { } -default ""]
+    if { $assign_group_p && [empty_string_p $assign_name] } {
+	set assign_name [db_string get_group_name { } -default ""]
+    }
+}