Index: openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-manager-procs.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl 30 Jun 2004 16:41:54 -0000 1.10 +++ openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl 30 Jun 2004 21:29:30 -0000 1.11 @@ -353,11 +353,32 @@ } # project + if {[string equal $type project]} { - # send out email - ns_log Notice "send project email" + set assignees [pm::project::assignee_email_list -project_item_id $object_id] + if {[llength $assignees] > 0} { + + set to_address $assignees + + set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"] + + set project_url "[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][ad_conn package_url]one?project_item_id=$object_id" + + set subject "Project comment: $title" + + set content "$project_url\n\n$comment" + + pm::util::email \ + -to_addr $to_address \ + -from_addr $from_address \ + -subject $subject \ + -body $content \ + -mime_type $mime_type + } + + } } Index: openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 28 Jun 2004 17:00:32 -0000 1.15 +++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 30 Jun 2004 21:29:30 -0000 1.16 @@ -1794,3 +1794,32 @@ fullname }] } + + +ad_proc -public pm::project::assignee_email_list { + -project_item_id:required +} { + Returns a list of assignee email addresses + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-06-30 + + @param project_item_id + + @return + + @error +} { + + return [db_list get_addresses { + SELECT + p.email + FROM + parties p, + pm_project_assignment a + WHERE + a.project_id = :project_item_id and + a.party_id = p.party_id + }] + +} Index: openacs-4/contrib/packages/project-manager/www/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v diff -u -r1.37 -r1.38 --- openacs-4/contrib/packages/project-manager/www/one.tcl 11 Jun 2004 20:58:19 -0000 1.37 +++ openacs-4/contrib/packages/project-manager/www/one.tcl 30 Jun 2004 21:29:30 -0000 1.38 @@ -100,14 +100,7 @@ set package_url [ad_conn package_url] set user_id [ad_maybe_redirect_for_registration] -# ---------------- -# general comments -# ---------------- -set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 $project_item_id "[ad_conn url]?project_item_id=$project_item_id"] -set comments_link [general_comments_create_link -object_name "Project" -link_text "Add a comment" -context_id $package_id $project_item_id "[ad_conn url]?project_item_id=$project_item_id"] - - # terminology and other parameters set project_term [parameter::get -parameter "ProjectName" -default "Project"] set project_term_lower [parameter::get -parameter "projectname" -default "project"] @@ -147,6 +140,14 @@ set project(earliest_finish_date) [lc_time_fmt $project(earliest_finish_date) "%x"] set project(latest_finish_date) [lc_time_fmt $project(latest_finish_date) "%x"] +# ---------------- +# general comments +# ---------------- +set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 $project_item_id "[ad_conn url]?project_item_id=$project_item_id"] + +set comments_link "Add comment" + + # we can also get the link to the logger instance. set logger_url [pm::util::logger_url] set logger_project_url "$logger_url?project_id=$project(logger_project)"