Index: openacs-4/packages/assessment/www/admin/item-edit-general.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-general.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/admin/item-edit-general.tcl	29 Dec 2004 09:07:39 -0000	1.4
+++ openacs-4/packages/assessment/www/admin/item-edit-general.tcl	7 Jan 2005 16:10:45 -0000	1.5
@@ -35,18 +35,25 @@
 }
 
 
-ad_form -name item_edit_general -action item-edit-general -export { assessment_id section_id } -form {
+ad_form -name item_edit_general -action item-edit-general -export { assessment_id section_id } -html {enctype multipart/form-data} -form {
     {as_item_id:key}
     {name:text(inform) {label "[_ assessment.Name]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.item_Name_help]"}}
     {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.item_Title_help]"}}
-    {description:text(textarea) {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.item_Description_help]"}}
+    {description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.item_Description_help]"}}
 }
 
 if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
     category::ad_form::add_widgets -container_object_id $package_id -categorized_object_id $as_item_id -form_name item_edit_general
 }
 
+if {[db_0or1row get_item_content {}]} {
+    ad_form -extend -name item_edit_general -form {
+	{delete_content:text(checkbox),optional {label "[_ assessment.item_Delete_Content]"} {options {{{<a href="../view/$content_filename?revision_id=$content_rev_id" target=view>$content_name</a>} t}} }}
+    }
+}
+
 ad_form -extend -name item_edit_general -form {
+    {content:file,optional {label "[_ assessment.item_Content]"} {help_text "[_ assessment.item_Content_help]"}}
     {subtext:text,optional {label "[_ assessment.Subtext]"} {html {size 80 maxlength 500}} {help_text "[_ assessment.item_Subtext_help]"}}
     {field_code:text,optional {label "[_ assessment.Field_Code]"} {html {size 80 maxlength 500}} {help_text "[_ assessment.Field_Code_help]"}}
     {required_p:text(select) {label "[_ assessment.Required]"} {options $boolean_options} {help_text "[_ assessment.item_Required_help]"}}
@@ -59,6 +66,9 @@
     {display_type:text(select) {label "[_ assessment.Display_Type]"} {options $display_types} {help_text "[_ assessment.Display_Type_help]"}}
 } -edit_request {
     db_1row general_item_data {}
+    if {[empty_string_p $data_type]} {
+	set data_type varchar
+    }
     set data_type_disp "[_ assessment.data_type_$data_type]" 
     set display_type [string range [db_string get_display_type {}] end-1 end]
 } -on_submit {
@@ -83,6 +93,31 @@
 	    category::map_object -object_id $new_item_id $category_ids
 	}
 
+	if {![empty_string_p $content]} {
+	    set filename [lindex $content 0]
+	    set tmp_filename [lindex $content 1]
+	    set file_mimetype [lindex $content 2]
+	    set n_bytes [file size $tmp_filename]
+	    set max_file_size 10000000
+	    # [ad_parameter MaxAttachmentSize]
+	    set pretty_max_size [util_commify_number $max_file_size]
+
+	    if { $n_bytes > $max_file_size && $max_file_size > 0 } {
+		ad_return_complaint 1 "[_ assessment.file_too_large]"
+		return
+	    }
+	    if { $n_bytes == 0 } {
+		ad_return_complaint 1 "[_ assessment.file_zero_size]"
+		return
+	    }
+
+	    set folder_id [as::assessment::folder_id -package_id $package_id]
+	    set content_rev_id [cr_import_content -package_id $package_id -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [exec uuidgen]]
+	    db_dml update_item_content {}
+	} elseif {[info exists delete_content]} {
+	    db_dml delete_item_content {}
+	}
+
 	set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id]
 	set new_section_id [as::section::new_revision -section_id $section_id]
 	db_dml update_section_in_assessment {}