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.17 -r1.24.2.18 --- openacs-4/contrib/packages/project-manager/www/task-one.tcl 2 May 2005 18:30:11 -0000 1.24.2.17 +++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 4 May 2005 06:13:53 -0000 1.24.2.18 @@ -79,6 +79,20 @@ # --------------------------------------------------------------- # +# the unique identifier for this package +#set package_id [ad_conn package_id] +#set package_url [ad_conn package_url] +#set user_id [ad_conn user_id] + + +# permissions. Seemed to be superceded below and now again because of granular permissions work. +#permission::require_permission -object_id $task_id -privilege "read" + +#set write_p [permission::permission_p -object_id $task_id -privilege "write"] +#set create_p [permission::permission_p -object_id $task_id -privilege "create"] + + + # terminology and other parameters set task_term [parameter::get -parameter "TaskName" -default "Task"] set task_term_lower [parameter::get -parameter "taskname" -default "task"] @@ -95,11 +109,12 @@ set user_id [ad_maybe_redirect_for_registration] -# permissions +# permissions. This is a general 'does the user have permission to even ask for this page to be run?' permission::require_permission -party_id $user_id -object_id $package_id -privilege read -set write_p [permission::permission_p -object_id $package_id -privilege write] -set create_p [permission::permission_p -object_id $package_id -privilege create] +# These values are now set by the query that extracts the task. +#set write_p [permission::permission_p -object_id $package_id -privilege write] +#set create_p [permission::permission_p -object_id $package_id -privilege create] @@ -201,8 +216,9 @@ set assignee_remove_self_url [export_vars -base task-assign-remove {{task_item_id $task_id} user_id return_url}] } +# Set the link to the permissions page +set permissions_url "[site_node::closest_ancestor_package -package_key subsite]/permissions/one?[export_vars {{object_id $task_id}}]" - 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"]