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.28 -r1.29 --- openacs-4/contrib/packages/project-manager/www/task-one.tcl 5 May 2004 19:04:55 -0000 1.28 +++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 14 May 2004 23:08:57 -0000 1.29 @@ -41,6 +41,7 @@ watcher_term:onevalue comments:onevalue comments_link:onevalue + print_link:onevalue use_uncertain_completion_times_p:onevalue } -validate { task_id_exists { @@ -77,11 +78,8 @@ set project_term [parameter::get -parameter "ProjectName" -default "Project"] set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"] -db_1row get_project_ids { } -set context [list "one?project_item_id=$project_item_id $project_term" "View"] - # the unique identifier for this package set package_id [ad_conn package_id] set user_id [ad_maybe_redirect_for_registration] @@ -99,6 +97,12 @@ db_1row task_query { } -column_array task_info +# we do this for the hours include portion +set project_item_id $task_info(project_item_id) + +set context [list [list "one?project_item_id=$task_info(project_item_id)" "$task_info(project_name)"] "$task_info(task_title)"] + + set richtext_list [list $task_info(description) $task_info(mime_type)] set task_info(description) [template::util::richtext::get_property html_value $richtext_list] @@ -123,19 +127,20 @@ set comments_link [general_comments_create_link -object_name "$task_term: $task_info(task_title)" -link_text "Add a comment" -context_id $package_id $task_id "[ad_conn url]?task_id=$task_id"] +set print_link "task-print?&task_id=$task_id@&project_item_id=$task_info(project_item_id)" # how to get back here set return_url [ad_return_url -qualified] -set task_edit_url "task-add-edit?my_key=1&task_id=$task_id&project_item_id=$project_item_id&return_url=$return_url" +set task_edit_url "task-add-edit?my_key=1&task_id=$task_id&return_url=$return_url" set logger_project [pm::project::get_logger_project \ - -project_item_id $project_item_id] + -project_item_id $task_info(project_item_id)] set logger_variable_id [logger::variable::get_default_variable_id] -set log_url "[ad_conn package_url]log?project_id=$logger_project&pm_project_id=$project_item_id&pm_task_id=$task_id" +set log_url "[ad_conn package_url]log?project_id=$logger_project&pm_project_id=$task_info(project_item_id)&pm_task_id=$task_id" set log_note "Task logged time listed below" @@ -280,7 +285,7 @@ -elements { first_names { label { - Who + Who } display_template { @people.user_info@