Index: openacs-4/packages/bug-tracker/www/admin/component-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/component-ae.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/admin/component-ae.tcl	9 Dec 2002 21:24:31 -0000	1.6
+++ openacs-4/packages/bug-tracker/www/admin/component-ae.tcl	13 Jan 2003 18:23:01 -0000	1.7
@@ -3,16 +3,10 @@
     @creation-date 2002-03-26
     @cvs-id $Id$
 } {
-    cancel:optional
     component_id:integer,optional
-    {return_url ""}
+    {return_url "."}
 }
 
-if { [exists_and_not_null cancel] } {
-    ad_returnredirect $return_url
-    ad_script_abort
-}
-
 set project_name [bug_tracker::conn project_name]
 set package_id [ad_conn package_id]
 set package_key [ad_conn package_key]
@@ -24,7 +18,7 @@
 }
 set context_bar [ad_context_bar $page_title]
 
-form create component
+form create component -cancel_url $return_url
 
 element create component return_url -datatype text -widget hidden -value $return_url
 
Index: openacs-4/packages/bug-tracker/www/admin/project-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/project-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/admin/project-edit.tcl	10 Sep 2002 22:22:28 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/admin/project-edit.tcl	13 Jan 2003 18:23:35 -0000	1.6
@@ -5,23 +5,17 @@
     @creation-date 2002-03-26
     @cvs-id $Id$
 } {
-    cancel:optional
-    {return_url ""}
+    {return_url "."}
 }
 
-if { [exists_and_not_null cancel] } {
-    ad_returnredirect $return_url
-    ad_script_abort
-}
-
 set project_name [bug_tracker::conn project_name]
 set package_id [ad_conn package_id]
 set package_key [ad_conn package_key]
 
 set page_title "Edit Project"
 set context_bar [ad_context_bar $page_title]
 
-form create project_info
+form create project_info -cancel_url $return_url
 
 element create project_info return_url -datatype text -widget hidden -value $return_url
 
Index: openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl	13 Jan 2003 18:14:05 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl	13 Jan 2003 18:29:08 -0000	1.6
@@ -5,16 +5,9 @@
     @creation-date 2002-03-26
     @cvs-id $Id$
 } {
-    cancel:optional
-    maintainer:integer,optional
-    {return_url ""}
+    {return_url "."}
 }
 
-if { [exists_and_not_null cancel] } {
-    ad_returnredirect $return_url
-    ad_script_abort
-}
-
 set project_name [bug_tracker::conn project_name]
 set package_id [ad_conn package_id]
 set package_key [ad_conn package_key]
@@ -23,13 +16,14 @@
 
 set context_bar [ad_context_bar $page_title]
 
-form create project_maintainer
+form create project_maintainer -cancel_url $return_url
 
 element create project_maintainer return_url -datatype text -widget hidden -value $return_url
 
 element create project_maintainer maintainer \
         -datatype search \
         -widget search \
+        -result_datatype integer \
         -label "Project Maintainer" \
         -options [bug_tracker::users_get_options] \
         -optional \
@@ -46,6 +40,8 @@
 }
 
 if { [form is_valid project_maintainer] } {
+    form get_values project_maintainer maintainer
+    
     db_dml project_maintainer_update {
         update bt_projects
         set    maintainer = :maintainer
Index: openacs-4/packages/bug-tracker/www/admin/version-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/version-ae.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bug-tracker/www/admin/version-ae.tcl	9 Dec 2002 21:24:31 -0000	1.4
+++ openacs-4/packages/bug-tracker/www/admin/version-ae.tcl	13 Jan 2003 18:31:14 -0000	1.5
@@ -5,15 +5,9 @@
     @cvs-id $Id$
 } {
     {version_id ""}
-    {return_url ""}
-    cancel:optional
+    {return_url "."}
 }
 
-if { [exists_and_not_null cancel] } {
-    ad_returnredirect $return_url
-    ad_script_abort
-}
-
 set project_name [bug_tracker::conn project_name]
 set package_id [ad_conn package_id]
 set package_key [ad_conn package_key]
@@ -30,7 +24,7 @@
 # no primary key and you're only inserting, you can just ignore it.  
 # Add handling for any other incoming URL variables that should become part of the form.
 
-form create version
+form create version -cancel_url $return_url
 
 element create version version_id -widget hidden
 element create version return_url -datatype text -widget hidden -value $return_url