Index: openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl	24 Dec 2004 15:32:38 -0000	1.6
+++ openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl	7 Jan 2005 16:10:44 -0000	1.7
@@ -20,7 +20,7 @@
     New Item Display CheckBox Type to the database
 } {
     set package_id [ad_conn package_id]
-    set folder_id [db_string get_folder_id "select folder_id from cr_folders where package_id=:package_id"]
+    set folder_id [as::assessment::folder_id -package_id $package_id]
 
     # Insert as_item_display_cb in the CR (and as_item_display_cb table) getting the revision_id (as_item_display_id)
     db_transaction {
@@ -76,7 +76,7 @@
     Copy an Item Display CheckBox Type
 } {
     set package_id [ad_conn package_id]
-    set folder_id [db_string get_folder_id "select folder_id from cr_folders where package_id=:package_id"]
+    set folder_id [as::assessment::folder_id -package_id $package_id]
 
     # Insert as_item_display_cb in the CR (and as_item_display_cb table) getting the revision_id (as_item_display_id)
     db_transaction {
@@ -126,7 +126,12 @@
 	}
     }
 
-    set options {-datatype text -widget checkbox -label $title -help_text $subtext -values $default_value -required_p $required_p -html $html_display_options -options $data}
+    set optional ""
+    if {$required_p != "t"} {
+	set optional ",optional"
+    }
+    set param_list [list [list label $title] [list help_text $subtext] [list values $default_value] [list options $data] [list html $html_display_options]]
+    set element_params [concat [list "$element\:text(checkbox)$optional"] $param_list]
 
-    eval template::element::create $form $element $options
+    ad_form -extend -name $form -form [list $element_params]
 }