Index: openacs-4/packages/workflow/tcl/action-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/action-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/tcl/action-procs.tcl	10 Jan 2003 13:38:37 -0000	1.1
+++ openacs-4/packages/workflow/tcl/action-procs.tcl	14 Jan 2003 15:09:16 -0000	1.2
@@ -7,29 +7,41 @@
     @cvs-id $Id$
 }
 
-namespace eval ::workflow::action {}
+namespace eval workflow::action {}
+namespace eval workflow:::action::fsm {}
 
-ad_proc -public ::workflow::action::add {
+#####
+#
+#  workflow::action namespace
+#
+#####
+
+ad_proc -public workflow::action::add {
     {-workflow_id:required}
+    {-sort_order {}}
     {-short_name:required}
     {-pretty_name:required}
     {-pretty_past_tense {}}
     {-assigned_role {}}
     {-allowed_roles {}}
     {-privileges {}}
+    {-always_enabled_p f}
 } {
-    This procedure should never be invoked from application code. Instead use
+    This procedure is normally not invoked from application code. Instead
     a procedure for a certain workflow implementation, such as for example
-    workflow::fsm::action::add for Finite State Machine workflows.
+    workflow::fsm::action::add (for Finite State Machine workflows), is used.
 
     @param workflow_id            The id of the FSM workflow to add the action to
     @param short_name             Short name of the action for use in source code.
                                   Should be on Tcl variable syntax.
     @param pretty_name            Human readable name of the action for use in UI.
     @param pretty_past_tense      Past tense of pretty name
-    @param assigned_role          Users in this role are expected (obliged) to take 
+    @param assigned_role          The name of an assigned role. Users in this 
+                                  role are expected (obliged) to take 
                                   the action.
-    @param allowed_roles          Users in these roles are allowed to take the action.
+    @param allowed_roles          A list of role names. Users in these roles are 
+                                  allowed to take the action.
+                                  
     @param privileges             Users with these privileges on the object 
                                   treated by the workflow (i.e. a bug in the 
                                   Bug Tracker) will be allowed to take this 
@@ -43,7 +55,16 @@
 } {
     db_transaction {
         # Insert basic action info
-        set action_id [db_nextval "wf_workflow_fsm_actions_seq"]
+        if { [empty_string_p $sort_order] } {
+            set sort_order [workflow::default_sort_order -workflow_id $workflow_id workflow_actions]
+        }
+        set action_id [db_nextval "workflow_actions_seq"]
+        if { [empty_string_p $assigned_role] } {
+            set assigned_role_id [db_null]
+        } else {
+            set assigned_role_id [workflow::role::get_id -workflow_id $workflow_id \
+                                                     -short_name $assigned_role]
+        }
         db_dml insert_action {}
 
         # Record which roles are allowed to take action
@@ -59,3 +80,64 @@
 
     return $action_id
 }
+
+ad_proc -public workflow::action::get_assigned_role {
+    {-action_id:required}
+} {
+    Return the assigned role of the given action
+    @param action_id The action_id of the action.
+    @return role_id of the assigned role.
+} {
+    return [db_string select_assigned_role {}]
+}
+
+ad_proc -public workflow::action::get_allowed_roles {
+    {-action_id:required}
+} {
+    Return the assigned role of the given action
+    @param action_id The action_id of the action.
+    @return List of role_id of the allowed roles
+} {
+    return [db_list select_allowed_roles {}]
+}
+
+ad_proc -public workflow::action::get_privileges {
+    {-action_id:required}
+} {
+    Return the assigned role of the given action
+    @param action_id The action_id of the action.
+    @return List of privileges that give permission to do this action
+} {
+    return [db_list select_privileges {}]
+}
+
+ad_proc -public workflow::action::get_id {
+    {-workflow_id:required}
+    {-short_name:required}
+} {
+    Return the action_id of the action with the given short_name in the given workflow.
+
+    @param workflow_id The ID of the workflow
+    @param short_name The short_name of the action
+    @return action_id of the desired action, or the empty string if it can't be found.
+} {
+    return [db_string select_action_id {} -default {}]
+}
+
+
+
+#####
+#
+# workflow::action::fsm
+#
+#####
+
+ad_proc -public workflow::action::fsm::get_new_state {
+    {-action_id:required}
+} {
+    Return the new state for an action
+    @param action_id The action_id of the action.
+    @return The new state after executing this action, or the empty string if the action doesn't change the state.
+} {
+    return [db_string select_new_state {} -default {}]
+}