Index: openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-assign-add-edit-postgresql.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit-postgresql.xql	3 Oct 2003 22:21:45 -0000	1.1
+++ openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit-postgresql.xql	12 Mar 2004 19:28:03 -0000	1.1.4.1
@@ -18,12 +18,19 @@
   <fullquery name="get_users">
     <querytext>
       select
-        first_names || ' ' || last_name || ' (' || email || ')' as who,
-        person_id
-	FROM
-        cc_users
+        p.first_names || ' ' || p.last_name as who,
+        p.person_id
+        FROM
+        persons p,
+        acs_rels r,
+        membership_rels mr
+        WHERE
+        r.object_id_one = :user_group_id and
+        mr.rel_id = r.rel_id and
+        p.person_id = r.object_id_two and
+        member_state = 'approved'
         ORDER BY
-        first_names, last_name
+        p.first_names, p.last_name
     </querytext>
   </fullquery>
 
Index: openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-assign-add-edit-postgresql.xql,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql	26 Jan 2004 15:39:40 -0000	1.5
+++ openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql	12 Mar 2004 19:28:03 -0000	1.5.2.1
@@ -41,12 +41,19 @@
   <fullquery name="get_users">
     <querytext>
       select
-        first_names || ' ' || last_name || ' (' || email || ')' as who,
-        person_id
-	FROM
-        cc_users
+        p.first_names || ' ' || p.last_name as who,
+        p.person_id
+        FROM
+        persons p,
+        acs_rels r,
+        membership_rels mr
+        WHERE
+        r.object_id_one = :user_group_id and
+        mr.rel_id = r.rel_id and
+        p.person_id = r.object_id_two and
+        member_state = 'approved'
         ORDER BY
-        first_names, last_name
+        p.first_names, p.last_name
     </querytext>
   </fullquery>
 
Index: openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-assign-add-edit.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl	12 Mar 2004 13:44:45 -0000	1.8
+++ openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl	12 Mar 2004 19:28:03 -0000	1.8.2.1
@@ -65,8 +65,12 @@
 
 # the unique identifier for this package
 set package_id [ad_conn package_id]
+set subsite_id [ad_conn subsite_id]
 set user_id    [ad_maybe_redirect_for_registration]
 
+set user_group_id [application_group::group_id_from_package_id \
+                       -package_id $subsite_id]
+
 # permissions
 
 set title "Add $task_term_lower assignments"