Index: openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/Attic/rels-list-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list-postgresql.xql 28 Nov 2001 18:39:39 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list-postgresql.xql 16 Oct 2003 13:49:36 -0000 1.3 @@ -7,12 +7,15 @@ select r.rel_id, acs_object__name(r.object_id_one) || ' and ' || acs_object__name(r.object_id_two) as name - from acs_rels r, app_group_distinct_rel_map m - where acs_permission__permission_p(r.rel_id, :user_id, 'read') + from acs_rels r, acs_object_party_privilege_map perm, + app_group_distinct_rel_map m + where perm.object_id = r.rel_id + and perm.party_id = :user_id + and perm.privilege = 'read' and r.rel_type = :rel_type and m.rel_id = r.rel_id and m.package_id = :package_id - order by lower(name) + order by lower(acs_object__name(r.object_id_one) || ' and ' || acs_object__name(r.object_id_two))