Index: openacs-4/packages/project-manager/lib/assignee-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/assignee-portlet.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/project-manager/lib/assignee-portlet.tcl 14 Sep 2005 14:27:33 -0000 1.7 +++ openacs-4/packages/project-manager/lib/assignee-portlet.tcl 14 Sep 2005 22:15:28 -0000 1.8 @@ -48,8 +48,18 @@ set assignee_edit_url [export_vars -base project-assign-edit {project_item_id return_url}] -db_multirow -extend {contact_url complaint_url} people project_people_query {} { - +set assign_group_p [parameter::get -parameter "AssignGroupP" -default 0] +if { $assign_group_p } { + set query_name "project_people_groups_query" +} else { + set query_name "project_people_query" +} + +db_multirow -extend {contact_url complaint_url name} people $query_name {} { + set name [db_string get_user_name { } -default ""] + if { $assign_group_p && [empty_string_p $name] } { + set name [db_string get_group_name { } -default ""] + } # If contacts is installed provide a link to the contacts party_id, otherwise don't if {![empty_string_p $contacts_url]} { set contact_url "${contacts_url}$party_id" @@ -60,13 +70,13 @@ } set elements [list \ - user_name [list \ - label "[_ project-manager.Who]" \ - display_template { - @people.user_name@ - - } \ - ] \ + name [list \ + label "[_ project-manager.Who]" \ + display_template { + @people.name@ + + } \ + ] \ role_name [list \ label "[_ project-manager.Role]" \ ]