Index: openacs-4/contrib/packages/project-manager/www/task-select-project.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-select-project.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/contrib/packages/project-manager/www/task-select-project.tcl 6 May 2004 22:27:21 -0000 1.5 +++ openacs-4/contrib/packages/project-manager/www/task-select-project.tcl 13 Jan 2005 13:54:36 -0000 1.6 @@ -14,6 +14,8 @@ } { {process_id:integer ""} + {process_task_id:integer,multiple ""} + {project_item_id ""} {return_url ""} {status_type "o"} {searchterm ""} @@ -41,16 +43,25 @@ unset searchterm } +set hidden_vars [export_vars -form {process_id return_url process_task_id:multiple}] -# terminology -set project_term [parameter::get -parameter "ProjectName" -default "Project"] -set task_term [parameter::get -parameter "TaskName" -default "Task"] -# set task_term_lower [parameter::get -parameter "taskname" -default "task"] -# set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"] +if {[exists_and_not_null project_item_id]} { + ad_returnredirect [export_vars -base task-add-edit {project_item_id process_id return_url process_task_id:multiple}] +} -set title "Select a $project_term to assign this $task_term to" +# terminology +set Project_Term [parameter::get -parameter "ProjectName" -default "Project"] +set project_term [parameter::get -parameter "projectname" -default "project"] +set Task_Term [parameter::get -parameter "TaskName" -default "Task"] +set task_term [parameter::get -parameter "taskname" -default "task"] +if {[empty_string_p $process_id]} { + set title "Select a $project_term to assign this $task_term to" +} else { + set title "Select a $project_term to assign this process to" +} + if {![exists_and_not_null searchterm]} { set searchterm_copy "" set searchterm_where_clause "" @@ -71,8 +82,6 @@ set root_folder [db_string get_root "select pm_project__get_root_folder (:package_id, 'f')"] -set hidden_vars [export_vars -form {process_id return_url}] - template::list::create \ -name projects \ -multirow projects \ @@ -139,7 +148,7 @@ db_multirow -extend { item_url description_html } projects select_a_project { } { - set item_url [export_vars -base "task-add-edit" {project_item_id process_id return_url}] + set item_url [export_vars -base "task-add-edit" {project_item_id process_id process_task_id:multiple return_url}] set richtext_list [list $description $mime_type] set description_html [template::util::richtext::get_property html_value $richtext_list]