Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.xql	3 May 2001 01:14:21 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.xql	19 Nov 2001 18:29:29 -0000	1.2
@@ -28,15 +28,15 @@
 <fullquery name="assigned_by_this">      
       <querytext>
       
-    select t.transition_name as assign_transition_name,
-           m.assign_transition_key,
+    select r.role_name,
+           r.role_key,
            '' as delete_url
-    from   wf_transition_assignment_map m, 
-           wf_transitions t
+    from   wf_transition_role_assign_map m, 
+           wf_roles r
     where  m.workflow_key = :workflow_key
     and    m.transition_key = :transition_key
-    and    t.workflow_key = m.workflow_key
-    and    t.transition_key = m.assign_transition_key
+    and    r.workflow_key = m.workflow_key
+    and    r.role_key = m.assign_role_key
 
       </querytext>
 </fullquery>
@@ -45,15 +45,15 @@
 <fullquery name="to_be_assigned_by_this">      
       <querytext>
       
-    select t.transition_name as assign_transition_name,
-           t.transition_key as assign_transition_key
-    from   wf_transitions t
-    where  t.workflow_key = :workflow_key
-    and    t.transition_key != :transition_key
-    and    not exists (select 1 from wf_transition_assignment_map m
+    select r.role_name,
+           r.role_key
+    from   wf_roles r
+    where  r.workflow_key = :workflow_key
+    and    r.role_key != (select role_key from wf_transitions t where workflow_key = :workflow_key and transition_key = :transition_key)
+    and    not exists (select 1 from wf_transition_role_assign_map m
                        where  m.workflow_key = :workflow_key
                        and    m.transition_key = :transition_key
-                       and    m.assign_transition_key = t.transition_key)
+                       and    m.assign_role_key = r.role_key)
 
       </querytext>
 </fullquery>