Index: openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl 10 Dec 2004 20:21:50 -0000 1.5 +++ openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl 7 Jan 2005 16:10:44 -0000 1.6 @@ -17,7 +17,7 @@ New Item Display TextBox 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_tb in the CR (and as_item_display_tb table) getting the revision_id (as_item_display_id) db_transaction { @@ -67,7 +67,7 @@ Copy an Item Display TextBox 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_tb in the CR (and as_item_display_tb table) getting the revision_id (as_item_display_id) db_transaction { @@ -98,18 +98,25 @@ Render an Item Display TextBox Type } { db_1row display_item_data {} - set maxlength_option "" - if {![empty_string_p $abs_size]} { - set maxlength_option {-maxlength $abs_size} - } if {[empty_string_p $required_p]} { set required_p f } if {[empty_string_p $datatype]} { set datatype text } - set options {-datatype $datatype -widget text -label $title -help_text $subtext -value $default_value -required_p $required_p -html $html_display_options} + # fixme + set datatype text - eval template::element::create $form $element $options $maxlength_option + set optional "" + if {$required_p != "t"} { + set optional ",optional" + } + set param_list [list [list label $title] [list help_text $subtext] [list value $default_value] [list html $html_display_options]] + if {![empty_string_p $abs_size]} { + lappend param_list [list maxlength $abs_size] + } + set element_params [concat [list "$element\:$datatype\(text)$optional"] $param_list] + + ad_form -extend -name $form -form [list $element_params] }