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.8 -r1.9 --- openacs-4/packages/project-manager/lib/assignee-portlet.tcl 14 Sep 2005 22:15:28 -0000 1.8 +++ openacs-4/packages/project-manager/lib/assignee-portlet.tcl 15 Sep 2005 07:43:14 -0000 1.9 @@ -56,9 +56,9 @@ } db_multirow -extend {contact_url complaint_url name} people $query_name {} { - set name [db_string get_user_name { } -default ""] + set name [person::name -person_id $party_id] if { $assign_group_p && [empty_string_p $name] } { - set name [db_string get_group_name { } -default ""] + set name [group::title -group_id $party_id] } # If contacts is installed provide a link to the contacts party_id, otherwise don't if {![empty_string_p $contacts_url]} { Index: openacs-4/packages/project-manager/lib/assignee-portlet.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/assignee-portlet.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/project-manager/lib/assignee-portlet.xql 14 Sep 2005 22:15:28 -0000 1.3 +++ openacs-4/packages/project-manager/lib/assignee-portlet.xql 15 Sep 2005 07:43:14 -0000 1.4 @@ -55,25 +55,4 @@ - - - select - group_name - from - groups - where - group_id = :party_id - - - - - - select - p.first_names || ' ' || p.last_name as name - from - persons p - where - person_id = :party_id - - \ No newline at end of file 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 -r1.4 -r1.5 --- openacs-4/packages/project-manager/lib/task-assignee-portlet.tcl 14 Sep 2005 22:15:28 -0000 1.4 +++ openacs-4/packages/project-manager/lib/task-assignee-portlet.tcl 15 Sep 2005 07:43:14 -0000 1.5 @@ -81,8 +81,8 @@ } db_multirow -extend { assign_name } people $query_name { } { - set assign_name [db_string get_user_name { } -default ""] + set assign_name [person::name -person_id $party_id] if { $assign_group_p && [empty_string_p $assign_name] } { - set assign_name [db_string get_group_name { } -default ""] + set assign_name [group::title -group_id $party_id] } } Index: openacs-4/packages/project-manager/lib/task-assignee-portlet.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-assignee-portlet.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager/lib/task-assignee-portlet.xql 14 Sep 2005 22:15:28 -0000 1.2 +++ openacs-4/packages/project-manager/lib/task-assignee-portlet.xql 15 Sep 2005 07:43:14 -0000 1.3 @@ -53,26 +53,4 @@ - - - select - u.first_names || ' ' || u.last_name as assign_name - from - persons u - where - u.person_id = :party_id - - - - - - select - group_name as assign_name - from - groups - where - group_id = :party_id - - - \ No newline at end of file Index: openacs-4/packages/project-manager/templates/task-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager/templates/task-ae.tcl 14 Sep 2005 22:19:07 -0000 1.2 +++ openacs-4/packages/project-manager/templates/task-ae.tcl 15 Sep 2005 07:43:14 -0000 1.3 @@ -369,13 +369,13 @@ foreach one_assignee $assignee_role_list { set person_id [lindex $one_assignee 0] if { [parameter::get -parameter "AssignGroupP" -default 0] } { - set name [db_string get_group_name { } -default ""] + set name [group::title -group_id $person_id] if { [empty_string_p $name] } { set name [person::name -person_id $person_id] } lappend assignee_options [list $name $person_id] } else { - set name [db_string get_group_name { } -default ""] + set name [group::title -group_id $person_id] if { [empty_string_p $name] } { set name [person::name -person_id $person_id] lappend assignee_options [list $name $person_id] Index: openacs-4/packages/project-manager/templates/task-ae.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager/templates/task-ae.xql 14 Sep 2005 22:19:07 -0000 1.2 +++ openacs-4/packages/project-manager/templates/task-ae.xql 15 Sep 2005 07:43:14 -0000 1.3 @@ -54,15 +54,4 @@ - - - select - group_name - from - groups - where - group_id = :person_id - - -