Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql 15 Jul 2002 20:12:46 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql 17 Oct 2002 12:59:53 -0000 1.1.2.1 @@ -10,7 +10,7 @@ dotlrn_users.last_name, dotlrn_users.email, acs_permission__permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, - acs_permission__permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p + acs_permission__permission_p(:root_object_id,dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users where dotlrn_users.type = :type order by dotlrn_users.last_name @@ -24,18 +24,19 @@ persons.last_name, parties.email, 'f' as read_private_data_p, - acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p, + member_state from parties, users, persons, acs_rels, membership_rels where parties.party_id = users.user_id + and member_state not in ('banned','deleted','rejected') and users.user_id = persons.person_id and persons.person_id = acs_rels.object_id_two and acs_rels.object_id_one = acs__magic_object_id('registered_users') and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'approved' and not exists (select 1 from acs_rels a, dotlrn_user_types