Index: openacs-4/packages/cms/www/modules/workflow/user-tasks-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/user-tasks-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/workflow/user-tasks-postgresql.xql 25 May 2001 23:49:05 -0000 1.1 +++ openacs-4/packages/cms/www/modules/workflow/user-tasks-postgresql.xql 19 Nov 2001 18:43:25 -0000 1.2 @@ -24,7 +24,7 @@ to_char(started_date,$date_format) as started_date_pretty, to_char(hold_timeout,'Mon. DD, YYYY') as hold_timeout_pretty, holding_user, person__name(holding_user) as holding_user_name, - content_workflow__is_overdue(c.case_id, ca.transition_key) as is_overdue + content_workflow__is_overdue(c.case_id, trans.transition_key) as is_overdue from wf_transitions trans, wf_tasks t, cr_items i, wf_cases c, wf_case_assignments ca @@ -41,7 +41,7 @@ and t.transition_key = trans.transition_key and - ca.transition_key = trans.transition_key + ca.role_key = trans.role_key and c.state = 'active' and @@ -58,10 +58,10 @@ select - ca.transition_key, transition_name, + trans.transition_key, transition_name, item_id, content_item__get_title(item_id) as title, to_char(deadline,'Mon. DD, YYYY') as deadline_pretty, - content_workflow__is_overdue(c.case_id, ca.transition_key) as is_overdue + content_workflow__is_overdue(c.case_id, trans.transition_key) as is_overdue from wf_case_assignments ca, wf_case_deadlines dead, wf_cases c, cr_items i, wf_transitions trans @@ -74,23 +74,23 @@ and c.case_id = dead.case_id and - ca.transition_key = trans.transition_key + ca.role_key = trans.role_key and dead.transition_key = trans.transition_key and c.object_id = i.item_id and c.state = 'active' and - content_workflow__is_finished(c.case_id, ca.transition_key) = 'f' + content_workflow__is_finished(c.case_id, trans.transition_key) = 'f' and not exists ( select 1 from wf_tasks where case_id = c.case_id and - transition_key = ca.transition_key + transition_key = trans.transition_key and state in ('enabled','started') ) and