Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-list-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-list-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-list-oracle.xql 3 Jul 2016 14:10:41 -0000 1.1.2.1
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ select DISTINCT g.group_id, g.group_name
+ from (select group_id, group_name
+ from groups g, acs_objects o
+ where g.group_id = o.object_id
+ and o.object_type = :group_type) g,
+ (select object_id
+ from acs_object_party_privilege_map
+ where party_id = :user_id and privilege = 'read') perm,
+ application_group_element_map m
+ where perm.object_id = g.group_id
+ and m.package_id = :package_id
+ and m.element_id = g.group_id
+ order by lower(g.group_name)
+
+
+
+
+
+
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-oracle.xql,v
diff -u -N -r1.1.30.1 -r1.1.30.2
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-oracle.xql 1 Jul 2016 13:47:06 -0000 1.1.30.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-oracle.xql 3 Jul 2016 14:10:41 -0000 1.1.30.2
@@ -1,7 +1,5 @@
-
- oracle8.1.6
@@ -38,5 +36,24 @@
+
+
+
+select r.rel_id,
+ party_names.party_name as element_name
+from (select DISTINCT rels.rel_id, object_id_two
+ from $extra_tables acs_rels rels, acs_object_party_privilege_map perm
+ where perm.object_id = rels.rel_id
+ and perm.party_id = :user_id
+ and perm.privilege = 'read'
+ and rels.rel_type = :rel_type
+ and rels.object_id_one = :group_id $extra_where_clauses) r,
+ party_names
+where r.object_id_two = party_names.party_id
+order by element_name
+
+
+
+
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-postgresql.xql,v
diff -u -N -r1.6 -r1.6.30.1
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-postgresql.xql 4 Dec 2001 00:20:47 -0000 1.6
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-postgresql.xql 3 Jul 2016 14:10:41 -0000 1.6.30.1
@@ -1,7 +1,5 @@
-
- postgresql7.1
@@ -18,6 +16,24 @@
+
+
+
+select r.rel_id,
+ party_names.party_name as element_name
+from (select DISTINCT rels.rel_id, object_id_two
+ from $extra_tables acs_rels rels
+ where rels.rel_type = :rel_type
+ and rels.object_id_one = :group_id $extra_where_clauses) r,
+ party_names
+where r.object_id_two = party_names.party_id
+and acs_permission__permission_p(rels.rel_id, :user_id, 'read')
+
+order by element_name
+
+
+
+
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl,v
diff -u -N -r1.5.2.3 -r1.5.2.4
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 1 Jul 2016 13:47:06 -0000 1.5.2.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 3 Jul 2016 14:10:41 -0000 1.5.2.4
@@ -40,26 +40,13 @@
if {$ancestor_rel_type eq "membership_rel"} {
if {$member_state ne ""} {
set extra_tables "membership_rels mr,"
- set extra_where_clauses "
- and mr.rel_id = rels.rel_id
- and mr.member_state = :member_state"
+ set extra_where_clauses {
+ and mr.rel_id = rels.rel_id
+ and mr.member_state = :member_state}
}
}
-db_multirow rels relations_query "
-select r.rel_id,
- party_names.party_name as element_name
-from (select /*+ ORDERED */ DISTINCT rels.rel_id, object_id_two
- from $extra_tables acs_rels rels, acs_object_party_privilege_map perm
- where perm.object_id = rels.rel_id
- and perm.party_id = :user_id
- and perm.privilege = 'read'
- and rels.rel_type = :rel_type
- and rels.object_id_one = :group_id $extra_where_clauses) r,
- party_names
-where r.object_id_two = party_names.party_id
-order by lower(element_name)
-"
+db_multirow rels relations_query {}
# Build the member state dimensional slider
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql 1 Jul 2016 13:47:06 -0000 1.2.30.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-select r.rel_id,
- party_names.party_name as element_name
-from (select DISTINCT rels.rel_id, object_id_two
- from $extra_tables acs_rels rels, acs_object_party_privilege_map perm
- where perm.object_id = rels.rel_id
- and perm.party_id = :user_id
- and perm.privilege = 'read'
- and rels.rel_type = :rel_type
- and rels.object_id_one = :group_id $extra_where_clauses) r,
- party_names
-where r.object_id_two = party_names.party_id
-order by element_name
-
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl,v
diff -u -N -r1.2.28.1 -r1.2.28.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl 10 Sep 2015 08:21:45 -0000 1.2.28.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl 3 Jul 2016 14:19:14 -0000 1.2.28.2
@@ -1,5 +1,3 @@
-# /packages/mbryzek-subsite/www/admin/rel-segments/constraints/index.tcl
-
ad_page_contract {
Shows all constraints on which the user has read permission
@@ -10,28 +8,14 @@
}
-set context [list [list ../ "Relational segments"] "Constraints"]
-
-set user_id [ad_conn user_id]
-
+set context [list [list ../ "Relational segments"] "Constraints"]
+set user_id [ad_conn user_id]
set package_id [ad_conn package_id]
# Select out basic information about all the constraints on which the
# user has read permission
-db_multirow constraints select_rel_constraints {
- select c.constraint_id, c.constraint_name
- from rel_constraints c, acs_object_party_privilege_map perm,
- application_group_segments s1, application_group_segments s2
- where perm.object_id = c.constraint_id
- and perm.party_id = :user_id
- and perm.privilege = 'read'
- and s1.segment_id = c.rel_segment
- and s1.package_id = :package_id
- and s2.segment_id = c.required_rel_segment
- and s2.package_id = :package_id
- order by lower(c.constraint_name)
-}
+db_multirow constraints select_rel_constraints {}
ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql 1 Jul 2016 13:47:06 -0000 1.2.30.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-
-
-
-
-
-
- select c.constraint_id, c.constraint_name
- from rel_constraints c
- application_group_segments s1, application_group_segments s2
- where s1.segment_id = c.rel_segment
- and s1.package_id = :package_id
- and s2.segment_id = c.required_rel_segment
- and s2.package_id = :package_id
- and exists (select 1
- from acs_object_party_privilege_map perm
- where perm.object_id = c.constraint_id
- and perm.party_id = :user_id
- and perm.privilege = 'read')
- order by lower(c.constraint_name)
-
-
-
-
-
-