Index: openacs-4/packages/assessment/tcl/as-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-procs.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/assessment/tcl/as-item-procs.tcl 13 Apr 2005 18:51:54 -0000 1.12 +++ openacs-4/packages/assessment/tcl/as-item-procs.tcl 15 Apr 2005 17:26:46 -0000 1.13 @@ -8,10 +8,10 @@ ad_proc -public as::item::new { {-item_item_id ""} - {-name ""} {-title:required} {-description ""} {-subtext ""} + {-field_name ""} {-field_code ""} {-required_p ""} {-data_type ""} @@ -33,15 +33,17 @@ if {[empty_string_p $item_item_id]} { set item_item_id [db_nextval acs_object_id_seq] } - if {[empty_string_p $name]} { - set name "QUE_$item_item_id" + set name "QUE_$item_item_id" + if {[empty_string_p $field_name]} { + set field_name $name } set item_item_id [content::item::new -item_id $item_item_id -parent_id $folder_id -content_type {as_items} -name $name] set as_item_id [content::revision::new -item_id $item_item_id \ -content_type {as_items} \ -title $title \ -description $description \ -attributes [list [list subtext $subtext] \ + [list field_name $field_name] \ [list field_code $field_code] \ [list required_p $required_p] \ [list data_type $data_type] \ @@ -59,6 +61,7 @@ {-title:required} {-description ""} {-subtext ""} + {-field_name ""} {-field_code ""} {-required_p ""} {-data_type ""} @@ -81,6 +84,7 @@ -title $title \ -description $description \ -attributes [list [list subtext $subtext] \ + [list field_name $field_name] \ [list field_code $field_code] \ [list required_p $required_p] \ [list data_type $data_type] \ @@ -112,6 +116,7 @@ -title $title \ -description $description \ -attributes [list [list subtext $subtext] \ + [list field_name $field_name] \ [list field_code $field_code] \ [list required_p $required_p] \ [list data_type $data_type] \ @@ -145,7 +150,9 @@ ad_proc -public as::item::copy { {-as_item_id:required} - {-name ""} + -title:required + {-description ""} + {-field_name ""} } { @author Timo Hentschel (timo@timohentschel.de) @creation-date 2004-12-07 @@ -161,16 +168,19 @@ append title "[_ assessment.copy_appendix]" set item_item_id [db_nextval acs_object_id_seq] - if {[empty_string_p $name]} { - set name "QUE_$item_item_id" + set name "QUE_$item_item_id" + if {[empty_string_p $field_name]} { + set field_name $name } + set item_item_id [content::item::new -item_id $item_item_id -parent_id $folder_id -content_type {as_items} -name $name] set new_item_id [content::revision::new \ -item_id $item_item_id \ -content_type {as_items} \ -title $title \ -description $description \ -attributes [list [list subtext $subtext] \ + [list field_name $field_name] \ [list field_code $field_code] \ [list required_p $required_p] \ [list data_type $data_type] \