Index: openacs-4/packages/acs-subsite/www/permissions/perm-include-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include-oracle.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/permissions/perm-include-oracle.xql 28 Aug 2003 09:41:41 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/permissions/perm-include-oracle.xql 29 Apr 2004 15:28:25 -0000 1.3 @@ -59,7 +59,7 @@ ) ptab, acs_objects o where o.object_id = ptab.grantee_id - and acs_permission.permission_p(0, ptab.grantee_id, 'admin') = 'f' + and not exists (select 1 from acs_object_party_privilege_map p where p.object_id = 0 and p.party_id = ptab.grantee_id and p.privilege = 'admin') group by ptab.grantee_id, acs_object.name(ptab.grantee_id), o.object_type order by object_type desc, grantee_name 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 -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql 28 Aug 2003 09:41:41 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql 29 Apr 2004 15:28:25 -0000 1.3 @@ -57,7 +57,7 @@ ) ptab, acs_objects o where o.object_id = ptab.grantee_id - and acs_permission__permission_p(0, ptab.grantee_id, 'admin') = 'f' + and not exists (select 1 from acs_object_party_privilege_map p where p.object_id = 0 and p.party_id = ptab.grantee_id and p.privilege = 'admin') group by ptab.grantee_id, grantee_name, object_type order by object_type desc, grantee_name