Index: openacs-4/packages/assessment/www/asm-admin/item-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-delete.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/assessment/www/asm-admin/item-delete.tcl 15 May 2007 20:14:18 -0000 1.6 +++ openacs-4/packages/assessment/www/asm-admin/item-delete.tcl 29 Aug 2008 19:19:08 -0000 1.7 @@ -7,6 +7,7 @@ assessment_id:integer section_id:integer as_item_id:integer + return_url:optional } -properties { context_bar:onevalue page_title:onevalue @@ -29,7 +30,7 @@ set confirm_options [list [list "[_ assessment.continue_with_remove]" t] [list "[_ assessment.cancel_and_return]" f]] -ad_form -name item_delete_confirm -action item-delete -export { assessment_id section_id } -form { +ad_form -name item_delete_confirm -action item-delete -export { assessment_id section_id return_url } -form { {as_item_id:key} {item_title:text(inform) {label "[_ assessment.remove_1]"}} {from:text(inform) {label "[_ assessment.from]"} {value $assessment_data(title)}} @@ -54,7 +55,11 @@ } } } -after_submit { - ad_returnredirect [export_vars -base questions {assessment_id}] + if { [info exists return_url] && $return_url ne "" } { + ad_returnredirect $return_url + } else { + ad_returnredirect [export_vars -base questions {assessment_id}] + } ad_script_abort }