Index: openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql,v diff -u -N -r1.7 -r1.7.2.1 --- openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql 1 May 2003 20:42:51 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql 4 Dec 2003 22:46:05 -0000 1.7.2.1 @@ -52,7 +52,11 @@ parent_id from site_nodes n where (object_id is null - or acs_permission.permission_p(object_id, :user_id, 'read') = 't') + or exists ( + select 1 from acs_object_party_privilege_map ppm + where ppm.object_id = n.object_id + and ppm.party_id = :user_id + and ppm.privilege = 'read')) start with node_id = nvl(:root_id, site_node.node_id('/')) connect by prior node_id = parent_id and parent_id in ([join $expand ", "])) site_map where site_map.object_id = p.package_id (+) @@ -64,16 +68,15 @@ select package_id, ap.package_key, - acs_object.name(package_id) as instance_name, + ap.instance_name, apm_package_type.num_parameters(ap.package_key) as parameter_count from apm_packages ap, apm_package_types where ap.package_key = apm_package_types.package_key and package_type = 'apm_service' - and ( - acs_permission.permission_p(package_id, :user_id, 'read') = 't' - or acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't' - ) + and not exists (select 1 from site_nodes sn where sn.object_id = package_id) + and exists (select 1 from acs_object_party_privilege_map ppm + where ppm.object_id = package_id and ppm.party_id = :user_id and ppm.privilege = 'admin') order by instance_name Index: openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql,v diff -u -N -r1.9 -r1.9.2.1 --- openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql 1 May 2003 20:42:51 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql 4 Dec 2003 22:46:05 -0000 1.9.2.1 @@ -25,27 +25,28 @@ pretty_name as package_pretty_name, apm_package_type__num_parameters(package_key) as parameter_count, node_id, url, parent_url, name, root_p, mylevel, object_id, - object_name, directory_p, parent_id, n_children, - (select case when acs_permission__permission_p(object_id, :user_id, 'admin') = 't' then 1 else 0 end) as object_admin_p + directory_p, parent_id, n_children, + p.instance_name as object_name, + acs_permission__permission_p(object_id, :user_id, 'admin') as object_admin_p from apm_packages p join apm_package_types using (package_key) right outer join (select n.node_id, site_node__url(n.node_id) as url, site_node__url(n.parent_id) as parent_url, n.name, - (select count(*) - from site_nodes - where parent_id = n.node_id) as n_children, - case when n.node_id = site_node__node_id('/', null) then 1 else 0 end as root_p, - (select tree_level(n.tree_sortkey) - tree_level(n2.tree_sortkey) - from site_nodes n2 - where n2.node_id = coalesce(:root_id, site_node__node_id('/', null))) as mylevel, + case when exists (select 1 from site_nodes where parent_id = n.node_id) then 1 else 0 end as n_children, + case when n.node_id = (select site_node__node_id('/', null)) then 1 else 0 end as root_p, + (tree_level(n.tree_sortkey) - (select tree_level(n2.tree_sortkey) from site_nodes n2 where n2.node_id = (select coalesce(:root_id, site_node__node_id('/', null))))) as mylevel, n.object_id, - acs_object__name(n.object_id) as object_name, n.directory_p, n.parent_id from site_nodes n, site_nodes n2 - where (n.object_id is null or acs_permission__permission_p(n.object_id, :user_id, 'read')) - and n2.node_id = coalesce(:root_id, site_node__node_id('/', null)) + where (n.object_id is null + or exists ( + select 1 from acs_object_party_privilege_map ppm + where ppm.object_id = n.object_id + and ppm.party_id = :user_id + and ppm.privilege = 'read')) + and n2.node_id = (select coalesce(:root_id, site_node__node_id('/', null))) and n.tree_sortkey between n2.tree_sortkey and tree_right(n2.tree_sortkey) and (n.parent_id is null or n.parent_id in ([join $expand ", "]))) site_map on site_map.object_id = p.package_id @@ -57,16 +58,15 @@ select package_id, ap.package_key, - acs_object__name(package_id) as instance_name, + ap.instance_name, apm_package_type__num_parameters(ap.package_key) as parameter_count from apm_packages ap, apm_package_types where ap.package_key = apm_package_types.package_key and package_type = 'apm_service' - and ( - acs_permission__permission_p(package_id, :user_id, 'read') = 't' - or acs_permission__permission_p(package_id, acs__magic_object_id('the_public'), 'read') = 't' - ) + and not exists (select 1 from site_nodes sn where sn.object_id = package_id) + and exists (select 1 from acs_object_party_privilege_map ppm + where ppm.object_id = package_id and ppm.party_id = :user_id and ppm.privilege = 'admin') order by instance_name Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v diff -u -N -r1.18 -r1.18.2.1 --- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 3 Oct 2003 18:33:05 -0000 1.18 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 4 Dec 2003 22:46:05 -0000 1.18.2.1 @@ -291,16 +291,14 @@ Manage unmounted applications

-

Set Parameters

+

Services