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.4 -r1.9.2.5
--- openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl	19 Jul 2005 15:57:12 -0000	1.9.2.4
+++ openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl	20 Jul 2005 15:36:13 -0000	1.9.2.5
@@ -10,6 +10,7 @@
     {edit_p:optional "0"}
     {type ""}
     {after "0"}
+    {edit_f ""}
 } -properties {
     context:onevalue
     page_title:onevalue
@@ -24,7 +25,7 @@
     permission::require_permission -object_id $assessment_id -privilege admin
     set s_assessment_id 0
     db_0or1row rev_id_from_item_id {}
-    if {![info exist type]} {
+    if {[empty_string_p  $type]} {
 	# Get the assessment data
 	as::assessment::data -assessment_id $assessment_id
 	set type $assessment_data(type)
@@ -57,7 +58,7 @@
 	{name:text(inform) {label "#assessment.Name#"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.assessment_Name_help]"}}
     }
 } else {
-    if {$type > 1} {
+    if {$type > 1 && [empty_string_p $edit_f]} {
 	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]"}}
 	}
@@ -68,40 +69,60 @@
     }
 }
 
-ad_form -extend -name assessment_form -form {
-    {title:text,nospell {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.as_Title_help]"}}
+if { [string eq $edit_f t] || [empty_string_p $edit_f]} {
+    ad_form -extend -name assessment_form -form {
+	{title:text,nospell {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.as_Title_help]"}}
+    }
+} else {
+    ad_form -extend -name assessment_form -form {
+	{title:text(hidden) {value ""}}
+    }
+	    
 }
-if { $type > 1} {
-    ad_form -extend -name assessment_form -form {    {description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.as_Description_help]"}}
+
+if {[string eq  $edit_f d] || [empty_string_p $edit_f]} {
+    if { $type > 1 } {
+    	ad_form -extend -name assessment_form -form {    {description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.as_Description_help]"}}
+	} 
+    } else {
+	ad_form -extend -name assessment_form -form { {description:text(hidden) {value ""}}}
     }
 }
 
+
 if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
     category::ad_form::add_widgets -container_object_id $package_id -categorized_object_id $s_assessment_id -form_name assessment_form
 }
 
-
- 
-ad_form -extend -name assessment_form -form {{instructions:text(textarea),optional {label "[_ assessment.Instructions]"} {html {rows 5 cols 80}} {help_text "[_ assessment.as_Instructions_help]"}}
+if { [string eq $edit_f i] || [empty_string_p $edit_f]} { 
+    ad_form -extend -name assessment_form -form {{instructions:text(textarea),optional {label "[_ assessment.Instructions]"} {html {rows 5 cols 80}} {help_text "[_ assessment.as_Instructions_help]"}}
+    }
+} else {
+    ad_form -extend -name assessment_form -form {{instructions:text(hidden) {value ""}}}
 }
-if { $type > 1} {
+
+if { $type > 1 && [empty_string_p $edit_f]} {
     ad_form -extend -name assessment_form -form {
 	{run_mode:text,optional,nospell {label "[_ assessment.Mode]"} {html {size 25 maxlength 25}} {help_text "[_ assessment.as_Mode_help]"}}
     }
 }
 
+
 if { !$permission_p } { 
-    ad_form -extend -name assessment_form  -form {
-	{anonymous_p:text(select) {label "[_ assessment.Anonymous_Responses]"} {options $boolean_options} {help_text "[_ assessment.as_Anonymous_help]"} {value f}}
-    } 
-} else {
-    ad_form -extend -name assessment_form  -form {
-	{anonymous_p:text(hidden) {value t}}
+    if { [empty_string_p $edit_f]} {
+	ad_form -extend -name assessment_form  -form {
+	    {anonymous_p:text(select) {label "[_ assessment.Anonymous_Responses]"} {options $boolean_options} {help_text "[_ assessment.as_Anonymous_help]"} {value f}}
+	} 
+    }     else {
+	ad_form -extend -name assessment_form  -form {
+	    {anonymous_p:text(hidden) {value t}}
+	}
+	
+	
     }
-    
 }
 
-if { $type > 1} {
+if { $type > 1 && [empty_string_p $edit_f]} {
     ad_form -extend -name assessment_form -form {{secure_access_p:text(select) {label "[_ assessment.Secure_Access_1]"} {options $boolean_options} {help_text "[_ assessment.as_Secure_Access_help]"}}
 	{reuse_responses_p:text(select) {label "[_ assessment.Reuse_Responses_1]"} {options $boolean_options} {help_text "[_ assessment.as_Reuse_Responses_help]"}}
 	{show_item_name_p:text(select) {label "[_ assessment.Show_Item_Name_1]"} {options $boolean_options} {help_text "[_ assessment.as_Show_Item_Name_help]"}}
@@ -110,7 +131,7 @@
     }
 }
 
-if { $type > 1} {
+if { $type > 1 && [empty_string_p $edit_f]} {
     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]"}}
@@ -126,7 +147,6 @@
 } 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"}}
 	{reuse_responses_p:text(hidden) {value "f"}}
Index: openacs-4/packages/assessment/www/asm-admin/assessment-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-new.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/assessment/www/asm-admin/assessment-new.tcl	18 Jul 2005 18:04:34 -0000	1.1.2.1
+++ openacs-4/packages/assessment/www/asm-admin/assessment-new.tcl	20 Jul 2005 15:36:13 -0000	1.1.2.2
@@ -33,9 +33,15 @@
 	{value $type}
     }
 } -on_submit {
-    if { ![empty_string_p $permission_p]} {
-	ad_returnredirect [export_vars -base assessment-form {type assessment_id permission_p}]
+    if { [exists_and_not_null assessment_id]} {
+    set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id]
+    db_dml update_asm { update as_assessments set type=:type where assessment_id=:new_assessment_rev_id}
+    ad_returnredirect [export_vars -base one-a {assessment_id}]
     } else {
-	ad_returnredirect [export_vars -base assessment-form {type assessment_id}]
+	if { ![empty_string_p $permission_p]} {
+	    ad_returnredirect [export_vars -base assessment-form {type assessment_id permission_p}]
+	} else {
+	    ad_returnredirect [export_vars -base assessment-form {type assessment_id}]
+	}
     }
-}
+}
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/one-a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.adp,v
diff -u -r1.11.2.5 -r1.11.2.6
--- openacs-4/packages/assessment/www/asm-admin/one-a.adp	19 Jul 2005 15:57:12 -0000	1.11.2.5
+++ openacs-4/packages/assessment/www/asm-admin/one-a.adp	20 Jul 2005 15:36:13 -0000	1.11.2.6
@@ -11,14 +11,19 @@
 <table class="table-display" cellpadding=2 cellspacing=0>
 
 <tr class="odd">
-	<td valign="top">#assessment.Assessment_Title#:<p>#assessment.Description#:<p>#assessment.Instructions#:<p>#assessment.Type#:</td>
+	<td valign="top">#assessment.Assessment_Title#:	<if @assessment_data.type@ gt 1><p>#assessment.Description#:</if><p>#assessment.Instructions#:<p>#assessment.Type#:</td>
 	<td valign="top"> 
 	<!-- <a href="assessment-preview?assessment_id=@assessment_id@">#assessment.Preview#</a> -->
-	<a href="assessment-new?assessment_id=@assessment_id@&edit_p=1">#assessment.Edit#</a>
-	@assessment_data.title;noquote@ <div align=center><font color=red>@is_reg_asm_p@</font></div>
+	@assessment_data.title;noquote@ 
+	<a href="assessment-form?assessment_id=@assessment_id@&edit_f=t">#assessment.Edit#</a>
+	<div align=center><font color=red>@is_reg_asm_p@</font></div>
+	<if @assessment_data.type@ gt 1>
         <p><if @assessment_data.description@ nil>#assessment.None#</if><else>@assessment_data.description;noquote@</else>
+	<a href="assessment-form?assessment_id=@assessment_id@&edit_f=d">#assessment.Edit#</a>
+	</if>
         <p><if @assessment_data.instructions@ nil>#assessment.None#</if><else>@assessment_data.instructions;noquote@</else>
-	<p><if @assessment_data.type@ nil>#assessment.None#</if><else><if @assessment_data.type@ eq 1>#assessment.type_s#</if> <if @assessment_data.type@ eq 2>#assessment.type_ea#</if></else></td>
+	<a href="assessment-form?assessment_id=@assessment_id@&edit_f=i">#assessment.Edit#</a>
+	<p><if @assessment_data.type@ nil>#assessment.None#</if><else><if @assessment_data.type@ eq 1>#assessment.type_s#</if> <if @assessment_data.type@ eq 2>#assessment.type_ea#</if></else>	<a href="assessment-new?assessment_id=@assessment_id@&edit_p=1">#assessment.Edit#</a></td>
 </td>
 </tr>