Index: openacs-4/packages/dotlrn/tcl/community-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v diff -u -r1.81.2.1 -r1.81.2.2 --- openacs-4/packages/dotlrn/tcl/community-procs.xql 16 Feb 2004 14:50:53 -0000 1.81.2.1 +++ openacs-4/packages/dotlrn/tcl/community-procs.xql 13 May 2004 12:36:58 -0000 1.81.2.2 @@ -138,14 +138,14 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email + from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id - and dotlrn_member_rels_approved.user_id = registered_users.user_id - order by dotlrn_member_rels_approved.rel_type, registered_users.last_name + and dotlrn_member_rels_approved.user_id = acs_users_all.user_id + order by dotlrn_member_rels_approved.rel_type, acs_users_all.last_name @@ -155,16 +155,16 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email + from acs_users_all, dotlrn_member_rels_approved, dotlrn_communities where dotlrn_communities.community_id = :subcomm_id and dotlrn_communities.parent_community_id = dotlrn_member_rels_approved.community_id - and registered_users.user_id = dotlrn_member_rels_approved.user_id - and registered_users.user_id not in (select dm.user_id + and acs_users_all.user_id = dotlrn_member_rels_approved.user_id + and acs_users_all.user_id not in (select dm.user_id from dotlrn_member_rels_full dm where dm.community_id = :subcomm_id) order by last_name @@ -177,13 +177,13 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email + from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id - and dotlrn_member_rels_approved.user_id = registered_users.user_id + and dotlrn_member_rels_approved.user_id = acs_users_all.user_id and dotlrn_member_rels_approved.rel_type = :rel_type Index: openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql 4 Dec 2002 09:51:04 -0000 1.4 +++ openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql 13 May 2004 12:38:03 -0000 1.4.2.1 @@ -9,14 +9,14 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email + from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id and dotlrn_member_rels_approved.user_id = - registered_users.user_id order by decode(role, + acs_users_all.user_id order by decode(role, 'instructor',1, 'admin',2, 'teaching_assistant',3, Index: openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql 4 Dec 2002 09:51:04 -0000 1.3 +++ openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql 13 May 2004 12:38:03 -0000 1.3.2.1 @@ -9,13 +9,13 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email + from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id - and dotlrn_member_rels_approved.user_id = registered_users.user_id + and dotlrn_member_rels_approved.user_id = acs_users_all.user_id order by ( CASE WHEN role = 'instructor'