Index: openacs-4/packages/assessment/www/asm-admin/item-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-copy.tcl,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/assessment/www/asm-admin/item-copy.tcl	28 Apr 2005 18:00:13 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-copy.tcl	1 Feb 2007 14:57:43 -0000	1.4.6.1
@@ -30,18 +30,19 @@
 
 set confirm_options [list [list "[_ assessment.continue_with_copy]" t] [list "[_ assessment.cancel_and_return]" f]]
 
-ad_form -name item_copy_confirm -action item-copy -export { assessment_id section_id after } -form {
+ad_form -name item_copy_confirm -action item-copy -export { assessment_id section_id after } -has_submit 1 -form {
     {as_item_id:key}
     {item_title:text(inform) {label "[_ assessment.copy_1]"}}
     {from:text(inform) {label "[_ assessment.from]"} {value $assessment_data(title)}}
     {title:text(textarea) {label "[_ assessment.item_Title]"} {html {rows 3 cols 80 maxlength 1000}} {help_text "[_ assessment.item_Title_help]"}}
     {description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.item_Description_help]"}}
     {field_name:text,optional,nospell {label "[_ assessment.Field_Name]"} {html {size 80 maxlength 500}} {help_text "[_ assessment.Field_Name_help]"}}
-    {confirmation:text(radio) {label " "} {options $confirm_options} {value f}}
+    {submit_ok:text(submit) {label "[_ acs-kernel.common_Copy]"}}
+    {submit_cancel:text(submit) {label "[_ acs-kernel.common_Cancel]"}}
 } -edit_request {
     db_1row item_data {}
 } -on_submit {
-    if {$confirmation} {
+    if {[exists_and_not_null submit_ok]} {
 	db_transaction {
 	    set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id]
 	    set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id]
@@ -56,7 +57,7 @@
 	}
     }
 } -after_submit {
-    ad_returnredirect [export_vars -base one-a {assessment_id}]
+    ad_returnredirect [export_vars -base questions {assessment_id}]
     ad_script_abort
 }
 
Index: openacs-4/packages/assessment/www/asm-admin/item-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-delete.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/assessment/www/asm-admin/item-delete.tcl	12 Jun 2006 02:49:51 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/item-delete.tcl	1 Feb 2007 14:57:43 -0000	1.5.2.1
@@ -51,7 +51,7 @@
 	}
     }
 } -after_submit {
-    ad_returnredirect [export_vars -base one-a {assessment_id}]
+    ad_returnredirect [export_vars -base questions {assessment_id}]
     ad_script_abort
 }
 
Index: openacs-4/packages/assessment/www/asm-admin/item-swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-swap.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/assessment/www/asm-admin/item-swap.tcl	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-swap.tcl	1 Feb 2007 14:57:43 -0000	1.3.2.1
@@ -36,4 +36,4 @@
     ad_script_abort
 }
 
-ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id
+ad_returnredirect [export_vars -base questions {assessment_id}]\#$as_item_id
Index: openacs-4/packages/assessment/www/asm-admin/section-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-delete.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/assessment/www/asm-admin/section-delete.tcl	12 Jun 2006 02:49:51 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/section-delete.tcl	1 Feb 2007 14:57:43 -0000	1.5.2.1
@@ -48,7 +48,7 @@
 	}
     }
 } -after_submit {
-    ad_returnredirect [export_vars -base one-a {assessment_id}]
+    ad_returnredirect [export_vars -base questions {assessment_id}]
     ad_script_abort
 }
 
Index: openacs-4/packages/assessment/www/asm-admin/section-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-form.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/assessment/www/asm-admin/section-form.tcl	24 Jan 2007 20:15:30 -0000	1.6.2.1
+++ openacs-4/packages/assessment/www/asm-admin/section-form.tcl	1 Feb 2007 14:57:43 -0000	1.6.2.2
@@ -124,7 +124,7 @@
 	}
     }
 } -after_submit {
-    ad_returnredirect [export_vars -base one-a {assessment_id}]
+    ad_returnredirect [export_vars -base questions {assessment_id}]
     ad_script_abort
 }
 
Index: openacs-4/packages/assessment/www/asm-admin/section-swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-swap.tcl,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/assessment/www/asm-admin/section-swap.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/section-swap.tcl	1 Feb 2007 14:57:43 -0000	1.2.6.1
@@ -32,4 +32,4 @@
     ad_script_abort
 }
 
-ad_returnredirect [export_vars -base one-a {assessment_id}]
+ad_returnredirect [export_vars -base questions {assessment_id}]