Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql,v
diff -u -r1.4 -r1.4.16.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql 11 Sep 2006 14:54:32 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql 18 Mar 2019 15:35:23 -0000 1.4.16.1
@@ -21,7 +21,7 @@
apm_package_version.sortable_version_name(v.version_name)))
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'
+ or acs_permission.permission_p(package_id, :the_public, 'read') = 't'
)
and (apm_package.singleton_p(p.package_key) = 0 or v.auto_mount is not null)
and not exists (select 1
@@ -31,26 +31,6 @@
-
-
- select p.package_id,
- acs_object.name(p.package_id) 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(package_id, :user_id, 'read') = 't'
- or acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't'
- )
- and exists (select 1
- from site_nodes
- where object_id = p.package_id)
- order by name
-
-
-
-
select p.package_id,
@@ -69,9 +49,10 @@
apm_package_version.sortable_version_name(v.version_name)))
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'
+ or acs_permission.permission_p(package_id, :the_public, 'read') = 't'
)
- and (apm_package.singleton_p(p.package_key) = 1 and v.auto_mount is null)
+ and apm_package.singleton_p(p.package_key) = 1
+ and v.auto_mount is null
and not exists (select 1
from site_nodes
where object_id = p.package_id)
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.7.2.1
--- 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 18 Mar 2019 15:35:23 -0000 1.7.2.1
@@ -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)
Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl 7 Aug 2017 23:47:58 -0000 1.6
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl 18 Mar 2019 15:35:23 -0000 1.6.2.1
@@ -19,11 +19,28 @@
set site_node_url [site_node::get_url -node_id $node_id]
+set the_public [acs_magic_object the_public]
+
db_multirow -extend { url } unmounted packages_unmounted_select {} {
set url [export_vars -base mount-2 { expand:multiple root_id node_id package_id }]
}
-db_multirow -extend { url } mounted packages_mounted_select {} {
+db_multirow -extend { url } mounted packages_mounted_select {
+ 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, :the_public, 'read')
+ )
+ and exists (select 1
+ from site_nodes
+ where object_id = p.package_id)
+ order by name
+} {
set url [export_vars -base mount-2 { expand:multiple root_id node_id package_id}]
}
Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl 7 Aug 2017 23:47:58 -0000 1.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl 18 Mar 2019 15:42:48 -0000 1.7.2.1
@@ -12,13 +12,37 @@
set context [list [list "." "Site Map"] $page_title]
set user_id [ad_conn user_id]
-db_multirow -extend {instance_delete_url delete_id} packages_normal packages_normal_select {} {
+set the_public [acs_magic_object the_public]
+
+db_multirow -extend {instance_delete_url delete_id} packages_normal packages_normal_select {
+ select package_id, instance_name as name, package_key
+ from apm_packages p
+ where (acs_permission.permission_p(package_id, :user_id, 'read') or
+ acs_permission.permission_p(package_id, :the_public, 'read'))
+ and not (select singleton_p from apm_package_types
+ where package_key = p.package_key)
+ and not exists (select 1
+ from site_nodes
+ where object_id = package_id)
+ order by name
+} {
set instance_delete_url [export_vars -base instance-delete package_id]
set delete_id action-delete-$package_id
template::add_confirm_handler -id $delete_id -message "Are you sure you want to delete package $name"
}
-db_multirow -extend {instance_delete_url delete_id} packages_singleton packages_singleton_select {} {
+db_multirow -extend {instance_delete_url delete_id} packages_singleton packages_singleton_select {
+ select package_id, instance_name as name, package_key
+ from apm_packages p
+ where (acs_permission.permission_p(package_id, :user_id, 'read') or
+ acs_permission.permission_p(package_id, :the_public, 'read'))
+ and (select singleton_p from apm_package_types
+ where package_key = p.package_key)
+ and not exists (select 1
+ from site_nodes
+ where object_id = package_id)
+ order by name
+} {
set instance_delete_url [export_vars -base instance-delete package_id]
set delete_id action-delete-$package_id
template::add_confirm_handler -id $delete_id -message "Are you sure you want to delete package $name"