Index: openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql 24 Feb 2005 13:33:01 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql 7 Aug 2017 23:47:59 -0000 1.5 @@ -24,8 +24,7 @@ sum([join $privs "_p + "]_p) as any_perm_p_ from (select grantee_id, [join $from_all_clauses ", "] - from acs_permissions_all - where object_id = :object_id + from acs_permission.permissions_all(:object_id) union all select grantee_id, [join $from_direct_clauses ", "] @@ -57,12 +56,10 @@ ) ptab, acs_objects o where o.object_id = ptab.grantee_id - and not exists (select 1 from acs_object_party_privilege_map p where p.object_id = acs__magic_object_id('security_context_root') and p.party_id = ptab.grantee_id and p.privilege = 'admin') + and not acs_permission__permission_p(acs__magic_object_id('security_context_root'), ptab.grantee_id, 'admin') group by ptab.grantee_id, grantee_name, object_type order by object_type desc, grantee_name - -