Index: openacs-4/packages/workflow/tcl/action-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/action-procs-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/workflow/tcl/action-procs-oracle.xql 5 Mar 2003 17:18:10 -0000 1.1 +++ openacs-4/packages/workflow/tcl/action-procs-oracle.xql 6 Nov 2003 15:42:59 -0000 1.2 @@ -21,7 +21,9 @@ and action_id = a.action_id ) as initial_action_p, fa.new_state as new_state_id, - (select short_name from workflow_fsm_states where state_id = fa.new_state) as new_state + (select short_name from workflow_fsm_states where state_id = fa.new_state) as new_state, + a.description, + a.description_mime_type from workflow_actions a, workflow_fsm_actions fa where a.workflow_id = :workflow_id Index: openacs-4/packages/workflow/tcl/action-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/action-procs-postgresql.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/workflow/tcl/action-procs-postgresql.xql 5 Mar 2003 17:18:10 -0000 1.1 +++ openacs-4/packages/workflow/tcl/action-procs-postgresql.xql 6 Nov 2003 15:42:59 -0000 1.2 @@ -21,7 +21,9 @@ and action_id = a.action_id ) as initial_action_p, fa.new_state as new_state_id, - (select short_name from workflow_fsm_states where state_id = fa.new_state) as new_state + (select short_name from workflow_fsm_states where state_id = fa.new_state) as new_state, + a.description, + a.description_mime_type from workflow_actions a left outer join workflow_fsm_actions fa on (a.action_id = fa.action_id) where a.workflow_id = :workflow_id 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 -N -r1.9 -r1.10 --- openacs-4/packages/workflow/tcl/action-procs.tcl 28 Oct 2003 13:39:03 -0000 1.9 +++ openacs-4/packages/workflow/tcl/action-procs.tcl 6 Nov 2003 15:42:59 -0000 1.10 @@ -32,10 +32,12 @@ {-callbacks {}} {-always_enabled_p f} {-initial_action_p f} + {-description {}} + {-description_mime_type {}} } { This procedure is normally not invoked from application code. Instead a procedure for a certain workflow implementation, such as for example - workflow::fsm::action::new (for Finite State Machine workflows), is used. + workflow::action::fsm::new (for Finite State Machine workflows), is used. @param workflow_id The id of the FSM workflow to add the action to @param sort_order The number which this action should be in the sort ordering sequence. @@ -67,7 +69,7 @@ @return The id of the created action - @see workflow::fsm::action::new + @see workflow::action::fsm::new @author Peter Marklund } { @@ -215,8 +217,8 @@ @author Lars Pind (lars@collaboraid.biz) @return An array list with workflow_id, sort_order, short_name, pretty_name, - pretty_past_tense, assigned_role, and always_enabled_p column - values for an action. + pretty_past_tense, assigned_role, and always_enabled_p, description, + description_mime_type column values for an action. } { # Select the info into the upvar'ed Tcl Array upvar $array row @@ -326,6 +328,8 @@ {-callbacks {}} {-always_enabled_p f} {-initial_action_p f} + {-description {}} + {-description_mime_type {}} } { Add an action to a certain FSM (Finite State Machine) workflow. This procedure invokes the generic workflow::action::new procedures @@ -353,7 +357,9 @@ -assigned_role $assigned_role \ -privileges $privileges \ -callbacks $callbacks \ - -always_enabled_p $always_enabled_p] + -always_enabled_p $always_enabled_p \ + -description $description \ + -description_mime_type $description_mime_type] # FSM specific data: @@ -390,6 +396,19 @@ return $action_id } +ad_proc -public workflow::action::fsm::delete { + {-action_id:required} +} { + Delete FSM action with given id. + + @author Peter Marklund +} { + db_dml delete_action { + delete from workflow_actions + where action_id = :action_id + } +} + ad_proc -public workflow::action::fsm::get_new_state { {-action_id:required} } { Index: openacs-4/packages/workflow/tcl/action-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/action-procs.xql,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/workflow/tcl/action-procs.xql 5 Mar 2003 17:18:10 -0000 1.7 +++ openacs-4/packages/workflow/tcl/action-procs.xql 6 Nov 2003 15:42:59 -0000 1.8 @@ -31,9 +31,9 @@ insert into workflow_actions (action_id, workflow_id, sort_order, short_name, pretty_name, pretty_past_tense, - edit_fields, assigned_role, always_enabled_p) + edit_fields, assigned_role, always_enabled_p, description, description_mime_type) values (:action_id, :workflow_id, :sort_order, :short_name, :pretty_name, :pretty_past_tense, - :edit_fields, :assigned_role_id, :always_enabled_p) + :edit_fields, :assigned_role_id, :always_enabled_p, :description, :description_mime_type) Index: openacs-4/packages/workflow/tcl/role-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/role-procs.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/workflow/tcl/role-procs.tcl 28 Aug 2003 09:41:59 -0000 1.8 +++ openacs-4/packages/workflow/tcl/role-procs.tcl 6 Nov 2003 15:42:59 -0000 1.9 @@ -100,6 +100,19 @@ return $role_id } +ad_proc -public workflow::role::delete { + {-role_id:required} +} { + Delete workflow role with given id. + + @author Peter Marklund +} { + db_dml delete_role { + delete from workflow_roles + where role_id = :role_id + } +} + ad_proc -public workflow::role::get_id { {-workflow_id:required} {-short_name:required}