Index: openacs-4/packages/project-manager/lib/project-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/project-calendar.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/project-calendar.tcl	22 Jul 2005 21:29:27 -0000	1.1
+++ openacs-4/packages/project-manager/lib/project-calendar.tcl	22 Jul 2005 22:04:29 -0000	1.2
@@ -80,8 +80,6 @@
 
 set users_to_view [pm::calendar::users_to_view]
 
-set subsite_id [ad_conn subsite_id]
-
 set community_id [dotlrn_community::get_community_id]
 
 set users_list "community_members"
Index: openacs-4/packages/project-manager/lib/task-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-calendar.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/task-calendar.tcl	21 Jul 2005 22:10:19 -0000	1.2
+++ openacs-4/packages/project-manager/lib/task-calendar.tcl	22 Jul 2005 22:04:29 -0000	1.3
@@ -81,28 +81,16 @@
 
 set users_to_view [pm::calendar::users_to_view]
 
-set subsite_id [ad_conn subsite_id]
+set community_id [dotlrn_community::get_community_id]
 
-set user_group_id [application_group::group_id_from_package_id \
-                       -package_id $subsite_id]
+set users_list "community_members"
 
+if {[empty_string_p $community_id]} {
+    set users_list  "dotlrn_members"
+}
 
-db_multirow -extend {checked_p} users users_list {
-      select
-        p.first_names || ' ' || p.last_name as name,
-        p.person_id as party_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
-        p.first_names, p.last_name
-} {
+
+db_multirow -extend {checked_p} users $users_list {} {
     if {[lsearch $users_to_view $party_id] == -1} {
         set checked_p f
     } else {
Index: openacs-4/packages/project-manager/lib/task-calendar.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-calendar.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/lib/task-calendar.xql	22 Jul 2005 22:04:29 -0000	1.1
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE queryset PUBLIC "-//OpenACS//DTD XQL 1.0//EN" "http://www.thecodemill.biz/repository/xql.dtd">
+<!-- packages/project-manager/lib/people.xql -->
+<!-- @author Malte Sussdorff (sussdorff@sussdorff.de) -->
+<!-- @creation-date 2005-05-01 -->
+<!-- @arch-tag: cb6d4744-1947-49b7-a3ab-a9f25a383956 -->
+<!-- @cvs-id $Id: task-calendar.xql,v 1.1 2005/07/22 22:04:29 annyf Exp $ -->
+
+<queryset>
+    <fullquery name="community_members">
+    <querytext>
+    select
+    p.first_names || ' ' || p.last_name as name,
+    p.person_id as party_id
+    FROM
+    persons p,
+    acs_rels r,
+    membership_rels mr
+    WHERE
+    r.object_id_one = :community_id and
+    mr.rel_id = r.rel_id and
+    p.person_id = r.object_id_two and
+    member_state = 'approved'
+    ORDER BY
+    p.first_names, p.last_name
+
+    </querytext>
+  </fullquery>
+
+    <fullquery name="dotlrn_members">
+    <querytext>
+    select
+    du.first_names || ' ' || du.last_name as name,
+    du.user_id as party_id
+    FROM
+    dotlrn_users du
+    </querytext>
+  </fullquery>
+
+</queryset>
\ No newline at end of file