Index: openacs-4/packages/project-manager/tcl/project-manager-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-manager-callback-procs.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/project-manager/tcl/project-manager-callback-procs.tcl 19 Feb 2007 15:56:54 -0000 1.16 +++ openacs-4/packages/project-manager/tcl/project-manager-callback-procs.tcl 22 Mar 2007 12:54:58 -0000 1.17 @@ -289,6 +289,7 @@ -creation_user $sender_id \ -title $file_title } + ns_log Notice "$item_id :: $package_id" set revision_id [content::revision::new \ -item_id $item_id \ -tmp_filename $file_path\ Index: openacs-4/packages/project-manager/templates/task-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/project-manager/templates/task-ae.tcl 28 Jan 2007 15:58:24 -0000 1.17 +++ openacs-4/packages/project-manager/templates/task-ae.tcl 22 Mar 2007 12:54:58 -0000 1.18 @@ -158,7 +158,7 @@ {description:richtext(richtext),optional {label "[_ project-manager.Task_description]"} {options $desc_options} - {html { cols 80 wrap soft}} + {html {rows 20 cols 80 wrap soft}} } } @@ -187,7 +187,7 @@ {comment:richtext(richtext),optional {label "[_ project-manager.Comment]"} {options $desc_options} - {html { cols 80 wrap soft}} + {html {rows 20 cols 80 wrap soft}} {section "[_ project-manager.Comment]"} } } Index: openacs-4/packages/project-manager/www/comments/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/comments/add.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/project-manager/www/comments/add.tcl 23 Dec 2006 16:31:08 -0000 1.16 +++ openacs-4/packages/project-manager/www/comments/add.tcl 22 Mar 2007 12:54:58 -0000 1.17 @@ -14,7 +14,6 @@ return_url:notnull {type "task"} {attach_p "f"} - {description:html ""} } -properties { } -validate { } -errors { @@ -32,10 +31,12 @@ set observer_role_id [db_list get_observer_role_id { }] if { [string equal $type "project"] } { set assignees [pm::project::assignee_role_list -project_item_id $object_id] + set project_item_id $object_id } if { [string equal $type "task"] } { set assignees [pm::task::assignee_role_list -task_item_id $object_id] + set project_item_id [pm::task::project_item_id -task_item_id $object_id] } set show_role_p 1 @@ -107,7 +108,16 @@ } } -# Just for wieners +# Options for the description + +# Where should we store the attached files in file storage +set desc_options [list editor xinha plugins OacsFs height 350px] +set folder_id [lindex [application_data_link::get_linked -from_object_id $project_item_id -to_object_type "content_folder"] 0] +if {$folder_id ne ""} { + lappend desc_options "folder_id" + lappend desc_options "$folder_id" +} + set listed_party_ids [list] ad_form -name comment \ -form { @@ -132,7 +142,8 @@ {description:richtext(richtext),optional {label "[_ project-manager.Comment_1]"} - {html { cols 90 wrap soft}} + {options $desc_options} + {html {rows 20 cols 80 wrap soft}} } {assignee:text(checkbox),multiple,optional {label "[_ project-manager.Send_email]"} @@ -182,7 +193,7 @@ } } -new_request { - set description [template::util::richtext::create "" {}] + set description [template::util::richtext::create "" "text/html"] } -on_submit {