Index: openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl 21 Feb 2005 14:32:56 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl 28 Feb 2005 22:30:39 -0000 1.4 @@ -13,11 +13,11 @@ if {![info exists assessment_id] || $__new_p} { set page_title [_ assessment.New_Assessment2] - set _assessment_id 0 + set s_assessment_id 0 } else { set page_title [_ assessment.Edit_Assessment] permission::require_permission -object_id $assessment_id -privilege admin - set _assessment_id 0 + set s_assessment_id 0 db_0or1row rev_id_from_item_id {} } set package_id [ad_conn package_id] @@ -58,7 +58,7 @@ } if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} { - category::ad_form::add_widgets -container_object_id $package_id -categorized_object_id $_assessment_id -form_name assessment_form + category::ad_form::add_widgets -container_object_id $package_id -categorized_object_id $s_assessment_id -form_name assessment_form } ad_form -extend -name assessment_form -form { Index: openacs-4/packages/assessment/www/asm-admin/assessment-form.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-form.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/asm-admin/assessment-form.xql 21 Feb 2005 14:32:56 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/assessment-form.xql 28 Feb 2005 22:30:39 -0000 1.3 @@ -30,7 +30,7 @@ - select latest_revision as _assessment_id + select latest_revision as s_assessment_id from cr_items where item_id = :assessment_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl 2 Feb 2005 21:31:15 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl 28 Feb 2005 22:38:33 -0000 1.3 @@ -98,6 +98,8 @@ 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::assessment::check::copy_item_checks -assessment_id $assessment_id -section_id $new_section_id -as_item_id $as_item_id -new_item_id $new_item_id + db_dml update_section_in_assessment {} db_dml update_item_in_section {} db_dml update_display_of_item {} Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 2 Feb 2005 21:31:15 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 28 Feb 2005 22:30:39 -0000 1.3 @@ -122,11 +122,11 @@ } elseif {[info exists delete_content]} { db_dml delete_item_content {} } - 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::assessment::check::copy_item_checks -assessment_id $assessment_id -section_id $new_section_id -as_item_id $as_item_id -new_item_id $new_item_id db_dml update_section_in_assessment {} db_dml update_item_in_section {} } Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl 21 Feb 2005 14:32:56 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl 28 Feb 2005 22:38:33 -0000 1.4 @@ -116,6 +116,8 @@ 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::assessment::check::copy_item_checks -assessment_id $assessment_id -section_id \$new_section_id -as_item_id \$as_item_id -new_item_id \$new_item_id + db_dml update_section_in_assessment {} db_dml update_item_in_section {} db_dml update_item_type {}