Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql 18 Jun 2018 13:21:02 -0000 1.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql 3 Sep 2024 15:37:34 -0000 1.8
@@ -20,8 +20,8 @@
and apm_package_version__sortable_version_name(v2.version_name) >
apm_package_version__sortable_version_name(v.version_name)))
and (
- acs_permission__permission_p(p.package_id, :user_id, 'read')
- or acs_permission__permission_p(p.package_id, acs__magic_object_id('the_public'), 'read')
+ acs_permission.permission_p(p.package_id, :user_id, 'read')
+ or acs_permission.permission_p(p.package_id, :the_public, 'read')
)
and (not pt.singleton_p or v.auto_mount is not null)
and not exists (select 1
@@ -32,25 +32,6 @@
-
-
- select p.package_id,
- p.instance_name as name,
- pt.pretty_name as package_pretty_name
- from apm_packages p,
- apm_package_types pt
- where pt.package_key = p.package_key
- and (
- acs_permission__permission_p(p.package_id, :user_id, 'read')
- or acs_permission__permission_p(p.package_id, acs__magic_object_id('the_public'), 'read')
- )
- and exists (select 1
- from site_nodes
- where object_id = p.package_id)
- order by name
-
-
-
select p.package_id,
@@ -68,10 +49,11 @@
and apm_package_version__sortable_version_name(v2.version_name) >
apm_package_version__sortable_version_name(v.version_name)))
and (
- acs_permission__permission_p(p.package_id, :user_id, 'read')
- or acs_permission__permission_p(p.package_id, acs__magic_object_id('the_public'), 'read')
+ acs_permission.permission_p(p.package_id, :user_id, 'read')
+ or acs_permission.permission_p(p.package_id, :the_public, 'read')
)
- and (pt.singleton_p and v.auto_mount is null)
+ and pt.singleton_p
+ and v.auto_mount is null
and not exists (select 1
from site_nodes
where object_id = p.package_id)