Index: openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql 26 Jan 2004 12:33:21 -0000 1.9 +++ openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql 28 Jan 2004 09:39:33 -0000 1.10 @@ -130,7 +130,6 @@ on delete cascade, assigned_p boolean default 'f', completed_p boolean default 'f', - -- TOOD: trigger_type, assigned_role, use_action_assignees_p ... execution_time timestamptz ); @@ -170,8 +169,6 @@ -- New and changed views -TODO: see which views have changed columns - -- Answers the question: Who is this user acting on behalf of? Which user is allowed to act on behalf of me? -- A mapping between users and their deputies create or replace view workflow_user_deputy_map as Index: openacs-4/packages/workflow/tcl/case-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/case-procs.xql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/workflow/tcl/case-procs.xql 23 Jan 2004 11:02:27 -0000 1.12 +++ openacs-4/packages/workflow/tcl/case-procs.xql 28 Jan 2004 09:39:34 -0000 1.13 @@ -198,7 +198,7 @@ workflow_case_enabled_actions ena where c.case_id = :case_id and cfsm.case_id = c.case_id - and cfsm.parent_enabled_action_id = :parent_enabled_action_id + and ((:parent_enabled_action_id is null and cfsm.parent_enabled_action_id is null) or (cfsm.parent_enabled_action_id = :parent_enabled_action_id)) and ena.enabled_action_id = :enabled_action_id and afsm.action_id = ena.action_id and ((afsm.new_state is null and s.state_id = cfsm.current_state) or (s.state_id = afsm.new_state))