Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/Attic/one-oracle.xql,v
diff -u -r1.1 -r1.1.30.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/one-oracle.xql 15 May 2001 16:59:00 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one-oracle.xql 3 Jul 2016 14:24:31 -0000 1.1.30.1
@@ -16,5 +16,20 @@
+
+
+
+ select count(*) as number_elements
+ from rel_segment_party_map map
+ where map.segment_id = :segment_id
+ and exists (select 1
+ from acs_object_party_privilege_map perm
+ where perm.object_id = map.party_id
+ and perm.party_id = :user_id
+ and perm.privilege = 'read')
+
+
+
+
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/Attic/one-postgresql.xql,v
diff -u -r1.3 -r1.3.24.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/one-postgresql.xql 17 May 2003 10:00:36 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one-postgresql.xql 3 Jul 2016 14:24:31 -0000 1.3.24.1
@@ -16,5 +16,16 @@
-
+
+
+
+ select count(*) as number_elements
+ from rel_segment_party_map map
+ where map.segment_id = :segment_id
+ and acs_permission__permission_p(map.party_id, :user_id, 'read')
+
+
+
+
+
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl 10 Sep 2015 08:21:45 -0000 1.6.2.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl 3 Jul 2016 14:24:31 -0000 1.6.2.2
@@ -54,14 +54,7 @@
where c.rel_segment = :segment_id
}
-db_1row select_segment_info {
- select count(*) as number_elements
- from rel_segment_party_map map, acs_object_party_privilege_map perm
- where perm.object_id = map.party_id
- and perm.party_id = :user_id
- and perm.privilege = 'read'
- and map.segment_id = :segment_id
-}
+db_1row select_segment_info {}
set number_elements [util_commify_number $number_elements]
set admin_p [permission::permission_p -object_id $segment_id -privilege "admin"]
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/one.xql,v
diff -u -r1.2 -r1.2.24.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/one.xql 17 May 2003 10:00:36 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one.xql 3 Jul 2016 14:24:31 -0000 1.2.24.1
@@ -10,22 +10,5 @@
-
-
-
-
- select count(*) as number_elements
- from rel_segment_party_map map
- where map.segment_id = :segment_id
- and exists (select 1
- from acs_object_party_privilege_map perm
- where perm.object_id = map.party_id
- and perm.party_id = :user_id
- and perm.privilege = 'read')
-
-
-
-
-
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/Attic/rels-list-postgresql.xql,v
diff -u -r1.3 -r1.3.24.1
--- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list-postgresql.xql 16 Oct 2003 13:49:36 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list-postgresql.xql 3 Jul 2016 14:27:36 -0000 1.3.24.1
@@ -7,14 +7,13 @@
select r.rel_id, acs_object__name(r.object_id_one) || ' and ' || acs_object__name(r.object_id_two) as name
- from acs_rels r, acs_object_party_privilege_map perm,
- app_group_distinct_rel_map m
- where perm.object_id = r.rel_id
- and perm.party_id = :user_id
- and perm.privilege = 'read'
+ from acs_rels r, app_group_distinct_rel_map m
+ where
and r.rel_type = :rel_type
and m.rel_id = r.rel_id
and m.package_id = :package_id
+ and acs_permission__permission_p(r.rel_id, :user_id, 'read')
+
order by lower(acs_object__name(r.object_id_one) || ' and ' || acs_object__name(r.object_id_two))