Index: openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl 2 Feb 2005 21:31:15 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl 2 Feb 2005 23:09:05 -0000 1.3 @@ -6,19 +6,24 @@ inter_item_check_id:multiple section_id assessment_id + by_item_p:integer + item_id_check:optional } + set package_id [ad_conn package_id] permission::require_permission -object_id $package_id -privilege create permission::require_permission -object_id $assessment_id -privilege admin as::assessment::data -assessment_id $assessment_id set title "$assessment_data(title)" + set context [list [list "one-a?assessment_id=$assessment_id" $title] [list "checks-admin?assessment_id=$assessment_id§ion_id=$section_id" "$title [_ assessment.Administration]"] "[_ assessment.trigger_delete]"] + set title "[_ assessment.trigger_delete]" -ad_form -name delete_checks -form { - +ad_form -name delete_checks -export {by_item_p item_id_check} -form { + {inter_item_check_id:text(hidden) {value $inter_item_check_id} } @@ -28,6 +33,13 @@ {assessment_id:text(hidden) {value $assessment_id} } -} -on_submit { - ad_returnredirect "checks-delete?section_id=$section_id&inter_item_check_id=$inter_item_check_id&assessment_id=$assessment_id" +} -after_submit { + + if {$by_item_p == 1} { + ad_returnredirect "checks-delete?section_id=$section_id&inter_item_check_id=$inter_item_check_id&assessment_id=$assessment_id&by_item_p=$by_item_p&item_id=$item_id_check" + } else { + ad_returnredirect "checks-delete?section_id=$section_id&inter_item_check_id=$inter_item_check_id&assessment_id=$assessment_id&by_item_p=$by_item_p" + } + + }