Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.tcl,v diff -u -r1.27.2.12 -r1.27.2.13 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 23 Sep 2004 22:00:10 -0000 1.27.2.12 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 24 Sep 2004 19:22:03 -0000 1.27.2.13 @@ -38,6 +38,7 @@ @param process_id The process we're using to create this task @param description @param old_description + @param old_description_mime_type @param comment @param name @param end_date @@ -67,6 +68,7 @@ {process_id:integer ""} description:html,array,optional {old_description ""} + {old_description_mime_type ""} comment:html,array,optional name:array,optional end_date:array,optional @@ -466,12 +468,14 @@ # note we are indexing values from 1... set i 1 set old_description [list] + set old_description_mime_type [list] db_foreach get_old_tasks { *SQL* } { set task_title_arr($i) $my_task_title set description_arr($i) $my_description lappend old_description $my_description + lappend old_description_mime_type $my_mime_type set mime_type_arr($i) $my_mime_type set template_arr($i) [list $my_description $my_mime_type] set estimated_hours_arr($i) $my_estimated_work @@ -567,7 +571,7 @@ } else { - + # ---------------------------------------------------------- # if we are using a process, then we want to fill in all the # default values for the user. @@ -1138,7 +1142,7 @@ } -after_submit { - ad_returnredirect -message "Task(s) saved. Now choose assignees" "task-assign-add-edit?[export_vars -url {comment_list comment_formats edit_p return_url process_task_id:multiple revisions:multiple task_id:multiple old_description send_email_p}]" + ad_returnredirect -message "Task(s) saved. Now choose assignees" "task-assign-add-edit?[export_vars -url {comment_list comment_formats edit_p return_url process_task_id:multiple revisions:multiple task_id:multiple old_description old_description_mime_type send_email_p}]" # compile a list of which projects the tasks are assigned to # there is a bug here, because we don't update a project when a Index: openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-assign-add-edit-postgresql.xql,v diff -u -r1.5.2.3 -r1.5.2.4 --- openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql 13 Aug 2004 18:57:34 -0000 1.5.2.3 +++ openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql 24 Sep 2004 19:22:03 -0000 1.5.2.4 @@ -21,6 +21,7 @@ select t.title as one_line, t.description, + t.mime_type, t.item_id, t.estimated_hours_work, t.estimated_hours_work_min, Index: openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-assign-add-edit.tcl,v diff -u -r1.8.2.6 -r1.8.2.7 --- openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl 9 Sep 2004 23:58:22 -0000 1.8.2.6 +++ openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl 24 Sep 2004 19:22:03 -0000 1.8.2.7 @@ -27,6 +27,7 @@ {comment_list:html ""} {comment_formats ""} {old_description:html ""} + {old_description_mime_type ""} {send_email_p "t"} } -properties { @@ -45,6 +46,7 @@ # hack to get around lack of multiple hidden support with ad_form set old_description [string map {"-" " "} $old_description] +set old_description_mime_type [string map {"-" " "} $old_description_mime_type] set comment_list [string map {"-" " "} $comment_list] set comment_formats [string map {"-" " "} $comment_formats] set process_task_id [string map {"-" " "} $process_task_id] @@ -60,6 +62,7 @@ set comment_value($t_id) [lindex $comment_list $index] set comment_format($t_id) [lindex $comment_formats $index] set old_description_value($t_id) [lindex $old_description $index] + set old_description_mime_type_value($t_id) [lindex $old_description_mime_type $index] incr index } @@ -148,6 +151,7 @@ set comment_pass [string map {" " "-"} $comment_list] set comment_format_pass [string map {" " "-"} $comment_formats] set old_description_pass [string map {" " "-"} $old_description] +set old_description_mime_type_pass [string map {" " "-"} $old_description_mime_type] set task_id_pass [string map {" " "-"} $task_id] ad_form -name add_edit -form { @@ -180,6 +184,9 @@ {old_description:text(hidden) {value $old_description_pass}} + {old_description_mime_type:text(hidden) + {value $old_description_mime_type_pass}} + {edit_p:text(hidden) {value $edit_p}} @@ -200,6 +207,7 @@ set project_names($item_id) $project_name set one_lines($item_id) $one_line set descriptions($item_id) $description + set description_mime_types($item_id) $mime_type set est_hours_work($item_id) $estimated_hours_work set est_hours_work_min($item_id) $estimated_hours_work_min set est_hours_work_max($item_id) $estimated_hours_work_max @@ -295,6 +303,7 @@ set my_comment_format $comment_format($t_id) set my_old_description $old_description_value($t_id) + set my_old_description_mime_type $old_description_mime_type_value($t_id) if {[string is true $send_email_p]} { pm::task::email_alert \ @@ -306,7 +315,9 @@ -comment $my_comment \ -comment_mime_type $my_comment_format \ -description $descriptions($t_id) \ + -description_mime_type $description_mime_types($t_id) \ -old_description $my_old_description \ + -old_description_mime_type $my_old_description_mime_type \ -subject $one_lines($t_id) \ -work_min $est_hours_work_min($t_id) \ -work_max $est_hours_work_max($t_id) \