Index: openacs-4/packages/invoices/www/invoice-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-delete.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/invoices/www/invoice-delete.tcl 16 Aug 2005 20:04:34 -0000 1.1 +++ openacs-4/packages/invoices/www/invoice-delete.tcl 2 Apr 2006 22:08:02 -0000 1.2 @@ -5,6 +5,7 @@ @creation-date 2005-06-06 } { invoice_id + {return_url:optional ""} } -properties { context:onevalue page_title:onevalue @@ -16,7 +17,7 @@ set confirm_options [list [list "[_ invoices.continue_with_delete]" t] [list "[_ invoices.cancel_and_return]" f]] -ad_form -name delete_confirm -action invoice-delete -form { +ad_form -name delete_confirm -action invoice-delete -export {return_url} -form { {invoice_id:key} {title:text(inform) {label "[_ invoices.Delete]"}} {confirmation:text(radio) {label " "} {options $confirm_options} {value f}} @@ -26,7 +27,11 @@ db_dml mark_deleted {} } } -after_submit { - ad_returnredirect "invoice-list" + if {[empty_string_p $return_url]} { + ad_returnredirect "invoice-list" + } else { + ad_returnredirect $return_url + } ad_script_abort }