Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/Attic/elements-by-rel-type-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type-oracle.xql 15 May 2001 16:59:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
-
- select g.rel_type, g.group_rel_id,
- acs_object_type.pretty_name(g.rel_type) as rel_type_pretty_name,
- s.segment_id, s.segment_name,
- acs_rel_type.role_pretty_plural(rel_types.role_two) as role_pretty_plural,
- acs_rel_type.role_pretty_name(rel_types.role_two) as role_pretty_name,
- rels.num_rels,
- case when valid_types.group_id = null then 0 else 1 end as rel_type_valid_p
- from group_rels g,
- rel_segments s,
- acs_rel_types rel_types,
- (select rel_type, count(*) as num_rels
- from group_component_map
- where group_id = :group_id
- and group_id = container_id
- group by rel_type
- UNION ALL
- select rel_type, count(*) as num_rels
- from group_approved_member_map
- where group_id = :group_id
- and group_id = container_id
- group by rel_type) rels,
- rc_valid_rel_types valid_types
- where g.group_id = s.group_id(+)
- and g.rel_type = s.rel_type(+)
- and g.rel_type = rels.rel_type(+)
- and g.rel_type = rel_types.rel_type
- and g.group_id = :group_id
- and g.group_id = valid_types.group_id(+)
- and g.rel_type = valid_types.rel_type(+)
- order by lower(g.rel_type)
-
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/Attic/elements-by-rel-type-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type-postgresql.xql 27 Jan 2018 16:19:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-
-
-
- postgresql7.1
-
-
-
-
- select
- g.group_id, g.rel_type, g.rel_type_valid_p, gr.group_rel_id,
- acs_object_type__pretty_name(g.rel_type) as rel_type_pretty_name,
- s.segment_id, s.segment_name,
- acs_rel_type__role_pretty_plural(rel_types.role_two) as role_pretty_plural,
- acs_rel_type__role_pretty_name(rel_types.role_two) as role_pretty_name,
- rels.num_rels
- from (
- select v.group_id, v.rel_type,
- case when v.group_id = null then 0 else 1 end as rel_type_valid_p
- from rc_valid_rel_types v where v.group_id = :group_id
- ) g
- left outer join rel_segments s using (group_id, rel_type)
- left outer join group_rels gr using (group_id, rel_type)
- left outer join
- (select rel_type, count(*) as num_rels
- from group_component_map
- where group_id = :group_id
- and group_id = container_id
- group by rel_type
- UNION ALL
- select rel_type, count(*) as num_rels
- from group_approved_member_map
- where group_id = :group_id
- and group_id = container_id
- group by rel_type) rels using (rel_type),
- acs_rel_types rel_types
- where g.rel_type = rel_types.rel_type
- order by lower(g.rel_type)
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl 25 Apr 2018 08:40:23 -0000 1.8
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl 28 Nov 2018 13:19:56 -0000 1.9
@@ -31,7 +31,42 @@
set return_url "[ad_conn url]?[ad_conn query]"
set return_url_enc [ad_urlencode $return_url]
-db_multirow -extend {elements_display_url relations_add_url} rels relations_query {} {
+db_multirow -extend {elements_display_url relations_add_url} rels relations_query {
+ select
+ g.group_id,
+ g.rel_type,
+ g.group_id = null as rel_type_valid_p,
+ gr.group_rel_id,
+ (select pretty_name from acs_object_types
+ where object_type = g.rel_type) as rel_type_pretty_name,
+ s.segment_id,
+ s.segment_name,
+ rr.pretty_plural as role_pretty_plural,
+ rr.pretty_name as role_pretty_name,
+ rels.num_rels
+ from rc_valid_rel_types g
+ left outer join rel_segments s using (group_id, rel_type)
+ left outer join group_rels gr using (group_id, rel_type)
+ left outer join
+ (select rel_type, count(*) as num_rels
+ from group_component_map
+ where group_id = :group_id
+ and group_id = container_id
+ group by rel_type
+ UNION ALL
+ select rel_type, count(*) as num_rels
+ from group_approved_member_map
+ where group_id = :group_id
+ and group_id = container_id
+ group by rel_type
+ ) rels using (rel_type),
+ acs_rel_types rel_types,
+ acs_rel_roles rr,
+ where g.rel_type = rel_types.rel_type
+ and rr.role_two = rel_types.role_two
+ and g.group_id = :group_id
+ order by lower(g.rel_type)
+} {
# The role pretty names can be message catalog keys that need
# to be localized before they are displayed
set role_pretty_name [lang::util::localize $role_pretty_name]