Index: openacs-4/packages/workflow/www/admin/workflow-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/workflow-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/workflow/www/admin/workflow-edit.tcl	6 Aug 2014 16:34:03 -0000	1.4
+++ openacs-4/packages/workflow/www/admin/workflow-edit.tcl	23 Jun 2015 09:41:53 -0000	1.5
@@ -14,15 +14,15 @@
 set title "Workflow Edit"
 
 workflow::get -workflow_id $workflow_id -array "wf_info"
-set context [list "$wf_info(short_name)"]
+set context [list $wf_info(short_name)]
 
 db_multirow -extend {edit_url delete_url} get_states get_states {} {
-    set edit_url "state-ae?[export_vars -url {state_id workflow_id}]"
+    set edit_url [export_vars -base state-ae {state_id workflow_id}]
     workflow::state::fsm::get \
 	    -state_id $state_id \
 	    -array "state_info"
     set msg "You are about to delete $state_info(pretty_name). Are you sure?"
-    set delete_url "delete-confirm?[export_url_vars id=$state_id {type state} msg]"
+    set delete_url "[export_url_vars id=$state_id {type state} msg]"
 }
 
 db_multirow -extend {edit_url delete_url} get_actions get_actions {} {
@@ -36,17 +36,17 @@
 
 
 db_multirow -extend {edit_url delete_url} get_roles get_roles {} {
-    set edit_url "role-ae?[export_vars -url {role_id workflow_id}]"
+    set edit_url [export_vars -base role-ae -url {role_id workflow_id}]
     workflow::role::get \
 	     -role_id $role_id \
 	    -array "role_info"
     set msg "You are about to delete $role_info(pretty_name). Are you sure?"
     set delete_url "delete-confirm?[export_url_vars id=$role_id msg {type role}]"
 }
 
-set wf_meta_edit "workflow-ae?[export_vars -url {workflow_id}]"
-set add_role_url "role-ae?[export_vars -url {workflow_id}]"
-set add_state_url "state-ae?[export_vars -url {workflow_id}]"
-set add_action_url "action-ae?[export_vars -url {workflow_id}]"
+set wf_meta_edit   [export_vars -base workflow-ae {workflow_id}]
+set add_role_url   [export_vars -base role-ae {workflow_id}]
+set add_state_url  [export_vars -base state-ae {workflow_id}]
+set add_action_url [export_vars -base action-ae {workflow_id}]