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.9.2.2 -r1.9.2.3
--- openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl	18 Jul 2005 18:01:01 -0000	1.9.2.2
+++ openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl	18 Jul 2005 22:25:08 -0000	1.9.2.3
@@ -56,8 +56,14 @@
 	{name:text(inform) {label "#assessment.Name#"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.assessment_Name_help]"}}
     }
 } else {
-    ad_form -extend -name assessment_form -form {
-	{name:text,optional,nospell {label "[_ assessment.Name]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.assessment_Name_help]"}}
+    if {$type > 1} {
+	ad_form -extend -name assessment_form -form {
+	    {name:text,optional,nospell {label "[_ assessment.Name]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.assessment_Name_help]"}}
+	}
+    } else {
+	ad_form -extend -name assessment_form -form {
+	    {name:text(hidden) {value ""}}
+	}
     }
 }
 
@@ -103,10 +109,8 @@
     }
 }
 
-ad_form -extend -name assessment_form -form {{return_url:text,optional,nospell {label "[_ assessment.Return_Url]"} {html {size 50 maxlength 50}} {help_text "[_ assessment.as_Return_Url_help]"}}}
-
 if { $type > 1} {
-    ad_form -extend -name assessment_form -form {
+    ad_form -extend -name assessment_form -form {{return_url:text,optional,nospell {label "[_ assessment.Return_Url]"} {html {size 50 maxlength 50}} {help_text "[_ assessment.as_Return_Url_help]"}}
 	{start_time:date,to_sql(sql_date),to_html(display_date),optional {label "[_ assessment.Start_Time]"} {format $form_format} {help} {help_text "[_ assessment.as_Start_Time_help]"}}
 	{end_time:date,to_sql(sql_date),to_html(display_date),optional {label "[_ assessment.End_Time]"} {format $form_format} {help} {help_text "[_ assessment.as_End_Time_help]"}}
 	{number_tries:integer,optional,nospell {label "[_ assessment.Number_of_Tries]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.as_Number_Tries_help]"}}
@@ -120,6 +124,7 @@
     }
 } else  {
     ad_form -extend -name assessment_form -form {
+	{return_url:text(hidden) value ""}
 	{description:text(hidden) value ""}
 	{run_mode:text(hidden) {value ""}}
 	{secure_access_p:text(hidden) {value "f"}}
Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/assessment/www/asm-admin/item-add.tcl	18 Jul 2005 18:01:01 -0000	1.7.2.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl	18 Jul 2005 22:25:08 -0000	1.7.2.3
@@ -83,10 +83,16 @@
     {feedback_wrong:text(hidden) {value ""}}
     {max_time_to_complete:text(hidden) {value ""}}
     {points:text(hidden) {value ""}}
+    {data_type:text(hidden) {value ""}}
+
 }
 }
+
+if { $type > 1} {
 ad_form -extend -name item_add -form {
-    {data_type:text(select) {label "[_ assessment.Data_Type]"} {options $data_types} {help_text "[_ assessment.Data_Type_help]"}}
+    {data_type:text(select) {label "[_ assessment.Data_Type]"} {options $data_types} {help_text "[_ assessment.Data_Type_help]"}}}
+} 
+ad_form -extend -name item_add -form {
     {item_type:text(select) {label "[_ assessment.Item_Type]"} {options $item_types} {help_text "[_ assessment.Item_Type_help]"}}
     {num_choices:integer,optional,nospell {label "[_ assessment.Num_Choices]"} {html {size 5 maxlength 3}} {help_text "[_ assessment.Num_Choices_help]"}}
 } -new_request {
@@ -113,6 +119,16 @@
 	set points 0
     }
 } -new_data {
+    if {[string eq $item_type "sa"]} {
+	set data_type "varchar" 
+    } elseif {[string eq $item_type "oq"]} {
+	set data_type "text" 
+    } elseif {[string eq $item_type "mc"]} {
+	set data_type "varchar" 
+    } elseif {[string eq $item_type "fu"]} {
+	set data_type "file" 
+    } 
+
     db_transaction {
 	if {![db_0or1row item_exists {}]} {
 	    set as_item_id [as::item::new \