Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl 30 Jul 2004 22:50:11 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl 10 Sep 2004 19:16:33 -0000 1.4 @@ -8,24 +8,33 @@ @cvs-id $Id$ } { task_id:integer,notnull - grade_id:integer,notnull - operation - return_url + grade_id:integer,notnull + operation + return_url } if { [string eq $operation [_ evaluation.lt_Yes_I_really_want_to__3]] } { + db_transaction { - db_exec_plsql delete_task { *SQL* } - + # calendar integration (begin) + db_1row get_item_id { *SQL* } + db_foreach cal_map { *SQL* } { + db_dml delete_mapping { *SQL* } + calendar::item::delete -cal_item_id $cal_item_id + } + # calendar integration (end) + + db_exec_plsql delete_task { *SQL* } + } on_error { - ad_return_error "[_ evaluation.lt_Error_deleting_the_ta]" "[_ evaluation.lt_We_got_the_following__2]" - ad_script_abort + ad_return_error "[_ evaluation.lt_Error_deleting_the_ta]" "[_ evaluation.lt_We_got_the_following__2]" + ad_script_abort } } else { if { [empty_string_p $return_url] } { - # redirect to the index page by default - set return_url "$return_url" + # redirect to the index page by default + set return_url "$return_url" } }