Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/active-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/active-tasks.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/active-tasks.adp	19 Nov 2001 18:11:03 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/active-tasks.adp	13 Jan 2002 00:30:50 -0000	1.2
@@ -19,7 +19,7 @@
 	  </tr>
 	  <multiple name="active_tasks">
 	    <tr bgcolor="#eeeeee">
-	      <td><a href="task?task_id=@active_tasks.task_id@">@active_tasks.transition_name@</a></td>
+	      <td><a href="task?task_id=@active_tasks.task_id@&return_url=@return_url@>@active_tasks.transition_name@</a></td>
 	      <td>@active_tasks.state@</td>
 	      <td>@active_tasks.enabled_date_pretty@</td>
 	      <td>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-list.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-list.tcl	19 Nov 2001 18:27:40 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-list.tcl	13 Jan 2002 00:30:50 -0000	1.4
@@ -19,8 +19,12 @@
     set package_url [ad_conn package_url]
 }
 
+# DRB: setting return_url to point explicitly at ourselves will cause
+# custom workflow action panels to return to the right place whether
+# they're called from the workflow UI or a custom package UI.
+
 if { ![info exists return_url] || [empty_string_p $return_url] } {
-    set return_url ""
+    set return_url [ad_conn url]
 }
 
 if { ![string equal $type "enabled"] && ![string equal $type "own"] \
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp	19 Nov 2001 18:27:40 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp	13 Jan 2002 00:30:50 -0000	1.4
@@ -25,7 +25,7 @@
 
 <multiple name="panels">
     <td bgcolor=@panels.bgcolor@ valign=top>
-	<include src="@panels.template_url@" &="task" &="task_attributes_to_set" &="task_assigned_users" &="task_roles_to_assign" &="return_url" &="export_form_vars">
+	<include src="@panels.template_url@" &="task" &="task_attributes_to_set" &="task_assigned_users" &="task_roles_to_assign" &="export_form_vars">
     </td>
 </multiple>