Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add-2.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add-2.tcl	19 Nov 2001 18:29:29 -0000	1.2
@@ -3,9 +3,13 @@
 } {
     workflow_key:notnull
     transition_name:notnull
+    role_key:allhtml
     trigger_type:notnull
-    estimated_minutes:optional,integer
+    {estimated_minutes:integer ""}
+    {instructions ""}
     {context_key "default"}
+    {return_url ""}
+    cancel:optional
 } -validate {
     transition_name_unique -requires { workflow_key:notnull transition_name:notnull } {
 	set num_rows [db_string num_transitions {
@@ -28,30 +32,35 @@
     }
 }
 
-
-set transition_key [wf_make_unique -maxlen 100 \
-	-taken_names [db_list transition_keys {select transition_key from wf_transitions where workflow_key = :workflow_key}] \
-	[wf_name_to_key $transition_name]]
-
-db_transaction {
-    
-    db_dml transition_add {
-	insert into wf_transitions (transition_key, transition_name, workflow_key, trigger_type)
-	values (:transition_key, :transition_name, :workflow_key, :trigger_type)
+if { [info exists cancel] && ![empty_string_p $cancel] } {
+    # User hit cancel
+    if { [empty_string_p $return_url] } {
+	set return_url "define?[export_vars -url {workflow_key}]"
     }
+    ad_returnredirect $return_url
+    return
+}
 
-    if { [info exists estimated_minutes] && ![empty_string_p $estimated_minutes] } {
-	db_dml estimated_minutes {
-	    insert into wf_context_transition_info 
-	    (context_key, workflow_key, transition_key, estimated_minutes)
-	    values (:context_key, :workflow_key, :transition_key, :estimated_minutes)
-	}
-    }
+set create_new_role_p 0
+if { [string equal $role_key "<new>"] } {
+    set role_key ""
+    set create_new_role_p 1
 }
-    
-wf_workflow_changed $workflow_key
 
-ad_returnredirect "define?[export_url_vars workflow_key transition_key]"
+set transition_key [wf_add_transition \
+	-workflow_key $workflow_key \
+	-transition_name $transition_name \
+	-role_key $role_key \
+	-trigger_type $trigger_type \
+	-estimated_minutes $estimated_minutes \
+	-instructions $instructions]
 
+if { [empty_string_p $return_url] } {
+    set return_url "define?[export_vars -url {workflow_key transition_key}]"
+}
 
-
+if { $create_new_role_p } {
+    set return_url "task-edit?[export_vars -url {workflow_key transition_key context_key return_url {new_role_p 1}}]"
+}
+    
+ad_returnredirect $return_url
\ No newline at end of file