Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map-oracle.xql,v
diff -u -r1.3 -r1.3.20.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map-oracle.xql 15 Feb 2005 16:02:19 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map-oracle.xql 3 Sep 2019 11:10:10 -0000 1.3.20.1
@@ -3,21 +3,6 @@
oracle8.1.6
-
-
- select node_id,
- name,
- directory_p,
- level,
- acs_object.name(object_id) as obj_name,
- acs_permission.permission_p(object_id, :user_id, 'admin') as admin_p
- from site_nodes
- start with node_id = :root_id
- connect by node_id = prior parent_id
- order by level desc
-
-
-
select package_id,
@@ -65,21 +50,4 @@
-
-
- select package_id,
- ap.package_key,
- 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 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/site-map-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map-postgresql.xql,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map-postgresql.xql 21 Oct 2018 17:36:23 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map-postgresql.xql 3 Sep 2019 11:10:10 -0000 1.5.2.1
@@ -3,23 +3,6 @@
postgresql7.1
-
-
- WITH RECURSIVE site_node_path AS (
- select node_id, parent_id, name, object_id, directory_p, 1 as level
- from site_nodes where node_id = :root_id
- UNION ALL
- select c.node_id, c.parent_id, c.name, c.object_id, c.directory_p, p.level+1
- from site_node_path p, site_nodes as c where c.node_id = p.parent_id
- )
- select
- node_id, name, directory_p, level,
- acs_object__name(object_id) as obj_name,
- acs_permission__permission_p(object_id, :user_id, 'admin') as admin_p
- from site_node_path order by level desc
-
-
-
postgresql8.4
@@ -57,22 +40,5 @@
order by url
-
-
- postgresql8.4
-
- select package_id,
- ap.package_key,
- 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 not exists (select 1 from site_nodes sn where sn.object_id = package_id)
- and acs_permission__permission_p (package_id, :user_id,'admin')
- order by instance_name
-
-
Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 16 May 2019 09:54:29 -0000 1.17.2.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 3 Sep 2019 11:10:10 -0000 1.17.2.2
@@ -55,7 +55,20 @@
# table.
#
set head ""
-db_foreach path_select {} {
+db_foreach path_select {
+ WITH RECURSIVE site_node_path AS (
+ select node_id, parent_id, name, object_id, directory_p, 1 as level
+ from site_nodes where node_id = :root_id
+ UNION ALL
+ select c.node_id, c.parent_id, c.name, c.object_id, c.directory_p, p.level+1
+ from site_node_path p, site_nodes as c where c.node_id = p.parent_id
+ )
+ select
+ node_id, name, directory_p, level,
+ acs_object.name(object_id) as obj_name,
+ acs_permission.permission_p(object_id, :user_id, 'admin') as admin_p
+ from site_node_path order by level desc
+} {
if {$node_id != $root_id && $admin_p == "t"} {
set href [export_vars -base . {expand:multiple {root_id $node_id}}]
append head [subst {}]
@@ -306,7 +319,20 @@
set services ""
-db_foreach services_select {} {
+db_foreach services_select {
+ select package_id,
+ ap.package_key,
+ ap.instance_name,
+ (select count(*) from apm_parameters
+ where package_key = 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 not exists (select 1 from site_nodes sn where sn.object_id = package_id)
+ and acs_permission.permission_p(package_id, :user_id,'admin')
+ order by instance_name
+} {
if {$parameter_count > 0} {
set href [export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]
append services [subst {$instance_name}]
Fisheye: Tag 1.2.24.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2.24.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.tcl 7 Aug 2017 23:47:58 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.tcl 3 Sep 2019 11:15:36 -0000 1.3.2.1
@@ -6,7 +6,15 @@
set package_url [ad_conn package_url]
set user_id [ad_conn user_id]
-db_multirow elements elements_select {}
+db_multirow elements elements_select {
+ select acs_object.name(map.party_id) as name, map.rel_id,
+ case when map.container_id = :group_id then 1 else 0 end as direct_p,
+ acs_object.name(map.container_id) as container_name
+ from rel_segment_party_map map
+ where acs_permission.permission_p(map.party_id, :user_id, 'read')
+ and map.segment_id = :segment_id
+ order by name
+}