Index: openacs-4/packages/assessment/www/asm-admin/item-edit-sa.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-sa.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-sa.tcl 29 Jun 2018 17:27:18 -0000 1.9 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-sa.tcl 30 Mar 2019 20:19:52 -0000 1.9.2.1 @@ -20,12 +20,16 @@ as::assessment::data -assessment_id $assessment_id if {![info exists assessment_data(assessment_id)]} { - ad_return_complaint 1 "[_ assessment.Requested_assess_does]" + ad_return_complaint 1 [_ assessment.Requested_assess_does] ad_script_abort } set page_title [_ assessment.edit_item_type_sa] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] set type $assessment_data(type) @@ -37,13 +41,13 @@ } if { $type > 1} { ad_form -extend -name item_edit_sa -form { - {increasing_p:text(select) {label "[_ assessment.Increasing]"} {options $boolean_options} {help_text "[_ assessment.Increasing_help]"}} - {allow_negative_p:text(select) {label "[_ assessment.Allow_Negative]"} {options $boolean_options} {help_text "[_ assessment.Allow_Negative_help]"}} + {increasing_p:text(select) {label "[_ assessment.Increasing]"} {options $boolean_options} {help_text "[_ assessment.Increasing_help]"}} + {allow_negative_p:text(select) {label "[_ assessment.Allow_Negative]"} {options $boolean_options} {help_text "[_ assessment.Allow_Negative_help]"}} } } else { ad_form -extend -name item_edit_sa -form { - {increasing_p:text(hidden) {value ""}} - {allow_negative_p:text(hidden) {value ""}} + {increasing_p:text(hidden) {value ""}} + {allow_negative_p:text(hidden) {value ""}} } } @@ -52,24 +56,24 @@ db_1row item_type_data {} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] - set as_item_type_id [db_string item_type_id {}] - set new_item_type_id [as::item_type_sa::edit \ - -as_item_type_id $as_item_type_id \ - -title $title \ - -increasing_p $increasing_p \ - -allow_negative_p $allow_negative_p] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set as_item_type_id [db_string item_type_id {}] + set new_item_type_id [as::item_type_sa::edit \ + -as_item_type_id $as_item_type_id \ + -title $title \ + -increasing_p $increasing_p \ + -allow_negative_p $allow_negative_p] - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::section::update_section_in_assessment\ + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_item_type {} + db_dml update_item_in_section {} + db_dml update_item_type {} } set as_item_id $new_item_id set section_id $new_section_id