Index: openacs-4/packages/bug-tracker/www/bug-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug-add.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/bug-add.tcl	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/bug-add.tcl	11 Jul 2002 08:28:20 -0000	1.2
@@ -12,7 +12,7 @@
 # If the user hit cancel, ignore everything else
 if { [exists_and_not_null cancel] } {
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 ad_require_permission [ad_conn package_id] create
@@ -153,7 +153,7 @@
     bt_bug_notify $bug_id "open" $description $desc_format
 
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 ad_return_template
Index: openacs-4/packages/bug-tracker/www/bug.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/bug.tcl	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/bug.tcl	11 Jul 2002 08:28:20 -0000	1.2
@@ -19,7 +19,7 @@
 # If the user hit cancel, ignore everything else
 if { [exists_and_not_null cancel] } {
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 ad_require_permission [ad_conn package_id] read
@@ -433,7 +433,7 @@
     bt_bug_notify $bug_id $mode $description $desc_format
 
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 ad_return_template
Index: openacs-4/packages/bug-tracker/www/prefs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/prefs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/prefs.tcl	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/prefs.tcl	11 Jul 2002 08:28:20 -0000	1.2
@@ -13,7 +13,7 @@
 # If the user hit cancel, ignore everything else
 if { [exists_and_not_null cancel] } {
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 # User needs to be logged in here
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 -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/component-ae.tcl	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/component-ae.tcl	11 Jul 2002 08:28:20 -0000	1.2
@@ -13,7 +13,7 @@
 
 if { [exists_and_not_null cancel] } {
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 set project_name [bt_conn project_name]
@@ -91,7 +91,7 @@
     }
 
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 ad_return_template
\ No newline at end of file
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 -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/project-edit.tcl	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/project-edit.tcl	11 Jul 2002 08:28:20 -0000	1.2
@@ -13,7 +13,7 @@
 
 if { [exists_and_not_null cancel] } {
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 set project_name [bt_conn project_name]
@@ -59,7 +59,7 @@
     }
     
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 ad_return_template
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 -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl	11 Jul 2002 08:28:20 -0000	1.2
@@ -12,7 +12,7 @@
 
 if { [exists_and_not_null cancel] } {
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 set project_name [bt_conn project_name]
@@ -23,35 +23,31 @@
 
 set context_bar [ad_context_bar $page_title]
 
-template::form create project_maintainer
+form create project_maintainer
 
-template::element create project_maintainer return_url -datatype text -widget hidden -value $return_url
+element create project_maintainer return_url -datatype text -widget hidden -value $return_url
 
-template::element create project_maintainer maintainer \
+element create project_maintainer maintainer \
         -datatype integer \
         -widget select \
         -label "Project Maintainer" \
+        -options [concat {{ "--None--" "" }} [db_list_of_lists users { select first_names || ' ' || last_name, user_id from cc_users }]] \
         -optional
 
-if { ![template::form is_valid project_maintainer] } {
-    template::element set_properties project_maintainer maintainer \
-            -options [concat {{ "--None--" "" }} [db_list_of_lists users { select first_names || ' ' || last_name, user_id from cc_users }]] 
-}
-
-if { [template::form is_request project_maintainer] } {
-    template::element set_properties project_maintainer maintainer \
+if { [form is_request project_maintainer] } {
+    element set_properties project_maintainer maintainer \
             -value [db_string maintainer { select maintainer from bt_projects where project_id = :package_id }]
 }
 
-if { [template::form is_valid project_maintainer] } {
+if { [form is_valid project_maintainer] } {
     db_dml project_maintainer_update {
         update bt_projects
         set    maintainer = :maintainer
         where  project_id = :package_id
     }
 
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 ad_return_template
\ No newline at end of file
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 -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/version-ae.tcl	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/version-ae.tcl	11 Jul 2002 08:28:20 -0000	1.2
@@ -11,7 +11,7 @@
 
 if { [exists_and_not_null cancel] } {
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 set project_name [bt_conn project_name]
@@ -119,6 +119,6 @@
     }
 
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }