Index: openacs-4/packages/project-manager/lib/tasks-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks-portlet.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/project-manager/lib/tasks-portlet.adp 19 Oct 2005 11:59:46 -0000 1.9 +++ openacs-4/packages/project-manager/lib/tasks-portlet.adp 30 Oct 2005 15:12:14 -0000 1.10 @@ -16,8 +16,7 @@ - + Index: openacs-4/packages/project-manager/lib/tasks-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks-postgresql.xql,v diff -u -r1.14 -r1.15 --- openacs-4/packages/project-manager/lib/tasks-postgresql.xql 30 Oct 2005 14:35:35 -0000 1.14 +++ openacs-4/packages/project-manager/lib/tasks-postgresql.xql 30 Oct 2005 15:12:15 -0000 1.15 @@ -129,14 +129,14 @@ - + select - username + item_id from - users + pm_projectsx where - user_id = :party_id + parent_id = :project_item_id Index: openacs-4/packages/project-manager/lib/tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks.tcl,v diff -u -r1.30 -r1.31 --- openacs-4/packages/project-manager/lib/tasks.tcl 30 Oct 2005 14:35:35 -0000 1.30 +++ openacs-4/packages/project-manager/lib/tasks.tcl 30 Oct 2005 15:12:15 -0000 1.31 @@ -29,6 +29,7 @@ } } + if ![info exists page_size] { set page_size 25 } @@ -78,7 +79,6 @@ set return_url [ad_return_url \ -qualified] -set logger_url [pm::util::logger_url] set contacts_url [util_memoize [list site_node::get_package_url \ -package_key contacts]] @@ -140,7 +140,7 @@ # Get the rows to display if {![exists_and_not_null elements]} { - set elements [list task_item_id title slack_time role latest_start latest_finish status_type remaining worked project_item_id percent_complete log_url edit_url] + set elements [list task_item_id title slack_time role latest_start latest_finish status_type remaining worked project_item_id percent_complete edit_url] } if ![info exist filter_package_id] { @@ -385,9 +385,6 @@ display_template {@tasks.project_name@} hide_p {[ad_decode [exists_and_not_null project_item_id] 1 1 0]} } - log_url { - display_template {L} - } edit_url { display_template {E} } @@ -455,13 +452,12 @@ set user_instead_full_p [parameter::get -parameter "UsernameInsteadofFullnameP" -default "f"] -db_multirow -extend {item_url earliest_start_pretty earliest_finish_pretty end_date_pretty latest_start_pretty latest_finish_pretty slack_time edit_url log_url hours_remaining days_remaining actual_days_worked my_user_id user_url base_url task_close_url project_url assignee_name} tasks tasks " " { +db_multirow -extend {item_url earliest_start_pretty earliest_finish_pretty end_date_pretty latest_start_pretty latest_finish_pretty slack_time edit_url hours_remaining days_remaining actual_days_worked my_user_id user_url base_url task_close_url project_url assignee_name} tasks tasks " " { if { $assign_group_p } { # We are going to show all asignees including groups if { $user_instead_full_p } { - set assignee_name [db_string get_assignee_name { } -default ""] - if { [empty_string_p $assignee_name] } { + if { [catch {set assignee_name [acs_user::get_element -user_id $party_id -element username]} err ] } { set assignee_name [group::title -group_id $party_id] } } else { @@ -473,8 +469,7 @@ } } else { if { $user_instead_full_p } { - set assignee_name [db_string get_assignee_name { } -default ""] - if { [empty_string_p $assignee_name] } { + if { [catch {set assignee_name [acs_user::get_element -user_id $party_id -element username]} err ] } { continue } } else { @@ -488,11 +483,6 @@ set item_url [export_vars \ -base "task-one" {{task_id $task_item_id}}] - set logger_project [db_string get_logger_project { } -default ""] - - set log_url [export_vars \ - -base "${logger_url}log" {{project_id $logger_project} {pm_task_id $task_item_id} {pm_project_id $project_item_id} {return_url $return_url}}] - set edit_url [export_vars \ -base "task-add-edit" {{task_id $task_item_id} project_item_id return_url}]