Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.xql,v diff -u -r1.1.32.1 -r1.1.32.2 --- openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.xql 9 Jul 2019 09:32:17 -0000 1.1.32.1 +++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.xql 9 Jul 2019 10:09:25 -0000 1.1.32.2 @@ -9,11 +9,8 @@ from groups g, acs_objects o where g.group_id = o.object_id and o.object_type = :group_type) g, - (select object_id - from acs_object_party_privilege_map - where party_id = :user_id and privilege = 'read') perm, application_group_element_map m - where perm.object_id = g.group_id + where acs_permission.permission_p(g.group_id, :user_id, 'read') and m.package_id = :package_id and m.element_id = g.group_id order by lower(g.group_name) Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql,v diff -u -r1.2.32.1 -r1.2.32.2 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql 9 Jul 2019 09:32:17 -0000 1.2.32.1 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql 9 Jul 2019 10:09:25 -0000 1.2.32.2 @@ -7,10 +7,8 @@ select r.rel_id, party_names.party_name as element_name from (select DISTINCT rels.rel_id, object_id_two - from $extra_tables acs_rels rels, acs_object_party_privilege_map perm - where perm.object_id = rels.rel_id - and perm.party_id = :user_id - and perm.privilege = 'read' + from $extra_tables acs_rels rels + where acs_permission.permission_p(rels.rel_id, :user_id, 'read') and rels.rel_type = :rel_type and rels.object_id_one = :group_id $extra_where_clauses) r, party_names Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql,v diff -u -r1.2.32.1 -r1.2.32.2 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql 9 Jul 2019 09:32:17 -0000 1.2.32.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql 9 Jul 2019 10:09:25 -0000 1.2.32.2 @@ -11,11 +11,7 @@ and s1.package_id = :package_id and s2.segment_id = c.required_rel_segment and s2.package_id = :package_id - and exists (select 1 - from acs_object_party_privilege_map perm - where perm.object_id = c.constraint_id - and perm.party_id = :user_id - and perm.privilege = 'read') + and acs_permission.permission_p(c.constraint_id, :user_id, 'read') order by lower(c.constraint_name)