Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v diff -u -r1.34 -r1.35 --- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 8 Aug 2006 21:26:41 -0000 1.34 +++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 24 Oct 2006 10:54:17 -0000 1.35 @@ -201,6 +201,7 @@ -notif_type:required {-evaluation_id ""} {-edit_p 0} + {-subset {}} } { db_1row select_names { *SQL* } @@ -241,12 +242,13 @@ # Notifies the users that requested notification for the specific object notification::new \ - -type_id [notification::type::get_type_id -short_name $notif_type] \ - -object_id $package_id \ - -response_id $response_id \ - -notif_subject $notif_subject \ - -notif_text $notif_text - + -type_id [notification::type::get_type_id -short_name $notif_type] \ + -object_id $package_id \ + -response_id $response_id \ + -notif_subject $notif_subject \ + -notif_text $notif_text \ + -subset $subset \ + -action_id $response_id } ad_proc -public evaluation::package_key {} { Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 8 Aug 2006 21:26:42 -0000 1.15 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 24 Oct 2006 10:54:18 -0000 1.16 @@ -202,8 +202,8 @@ content::item::set_live_revision -revision_id $revision_id if { [string eq $new_p_gs($party_id) 0] } { - # if editing the grade, send the notification - evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif + # if editing the grade and suscribed, send the notification + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] } } @@ -232,6 +232,8 @@ -show_student_p $show_student_wa($party_id) -grade $grades_wa($party_id) -task_item_id $task_item_id -party_id $party_id] content::item::set_live_revision -revision_id $revision_id + # notify the user if suscribed + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] } } } @@ -256,6 +258,8 @@ -show_student_p $show_student_na($party_id) -grade $grades_na($party_id) -task_item_id $task_item_id -party_id $party_id] content::item::set_live_revision -revision_id $revision_id + # notify the user if suscribed + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] } } } @@ -270,8 +274,8 @@ content::item::set_live_revision -revision_id $revision_id - # send the notification to everyone suscribed - evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif + # notify the user if suscribed + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] } } Index: openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 8 Aug 2006 21:26:42 -0000 1.9 +++ openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 24 Oct 2006 10:54:18 -0000 1.10 @@ -80,7 +80,7 @@ } # send the notification to everyone suscribed - evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif -subset [list $party_id] ad_returnredirect "$return_url" ad_script_abort