Index: openacs-4/packages/project-manager/tcl/project-manager-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-manager-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/tcl/project-manager-procs-postgresql.xql	26 May 2005 09:34:29 -0000	1.3
+++ openacs-4/packages/project-manager/tcl/project-manager-procs-postgresql.xql	27 Jul 2005 19:04:37 -0000	1.4
@@ -43,13 +43,11 @@
       p.person_id
       FROM
       persons p,
-      acs_rels r,
-      membership_rels mr
+      acs_object_party_privilege_map ppm
       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'
+      ppm.object_id = :package_id
+      and ppm.privilege = 'read'
+      and ppm.party_id = p.person_id
       ORDER BY name
     </querytext>
   </fullquery>
Index: openacs-4/packages/project-manager/tcl/project-manager-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-manager-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/tcl/project-manager-procs.tcl	3 Jun 2005 22:13:44 -0000	1.4
+++ openacs-4/packages/project-manager/tcl/project-manager-procs.tcl	27 Jul 2005 19:04:37 -0000	1.5
@@ -735,11 +735,12 @@
     @error 
 } {
 
-    if [empty_string_p $subsite_id] {
-	set subsite_id [ad_conn subsite_id]
-    }
+#    if [empty_string_p $subsite_id] {
+#	set subsite_id [ad_conn subsite_id]
+#    }
     
-    set user_group_id [application_group::group_id_from_package_id \
+    set package_id [ad_conn package_id]
+#    set user_group_id [application_group::group_id_from_package_id \
                            -package_id $subsite_id]
 
     set assignees [db_list_of_lists get_assignees { }]
Index: openacs-4/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/task-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/project-manager/tcl/task-procs.tcl	21 Jun 2005 23:26:13 -0000	1.9
+++ openacs-4/packages/project-manager/tcl/task-procs.tcl	27 Jul 2005 19:04:37 -0000	1.10
@@ -1886,8 +1886,6 @@
                 fullname"]
 }
 
-
-
 ad_proc -public pm::task::assignee_html {
     {-number:required}
     {-process_task_id ""}
Index: openacs-4/packages/project-manager/www/project-assign-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/project-assign-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/www/project-assign-edit.tcl	10 Jun 2005 19:21:15 -0000	1.5
+++ openacs-4/packages/project-manager/www/project-assign-edit.tcl	27 Jul 2005 19:04:37 -0000	1.6
@@ -30,12 +30,6 @@
 # permissions
 permission::require_permission -party_id $user_id -object_id $project_item_id -privilege write
 
-set subsite_id [ad_conn subsite_id]
-
-set user_group_id [application_group::group_id_from_package_id \
-                       -package_id $subsite_id]
-
-
 set project_name [pm::project::name -project_item_id $project_item_id]
 
 set title "[_ project-manager.lt_Edit_project_assignee]"
@@ -68,21 +62,7 @@
 
 set contact_id [application_data_link::get_linked -from_object_id $party_id -to_object_type "content_item"]
 
-set assignee_list_of_lists [db_list_of_lists get_assignees {
-    select distinct
-    p.first_names || ' ' || p.last_name as name,
-    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 name
-}]
+set assignee_list_of_lists [pm::util::subsite_assignees_list_of_lists]
 
 
 set html "<form action=\"project-assign-edit-2\" method=\"post\"><table border=0 width=\"100\%\"><tr>"