Fisheye: Tag 1.1.32.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/groups/elements-display-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/groups/elements-display-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl	3 Jul 2018 13:22:40 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl	2 Jan 2020 17:16:36 -0000	1.10.2.1
@@ -39,9 +39,19 @@
 
 # Select out the group name and the group's object type. Note we can
 # use 1row because the validate filter above will catch missing groups
+db_1row group_and_rel_info {
+    select (select group_name from groups
+            where group_id = :group_id) as group_name,
+           (select pretty_name from acs_object_types
+            where object_type = :rel_type) as rel_type_pretty_name,
+           r.pretty_plural as role_pretty_plural,
+           r.pretty_name as role_pretty_name
+      from acs_rel_types rel_types,
+           acs_rel_roles r
+     where r.role = rel_types.role_two
+       and rel_types.rel_type = :rel_type
+}
 
-db_1row group_and_rel_info {}
-
 # 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]
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/relations/remove-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/relations/remove-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	20 Jun 2018 08:23:51 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	2 Jan 2020 17:19:41 -0000	1.6.2.1
@@ -50,7 +50,15 @@
 if { [relation_segment_has_dependent -rel_id $rel_id] } {
     set return_url "[ad_conn url]?[ad_conn query]"
     # We can't remove this relation - display the violations
-    db_multirow -extend {export_vars} dependents select_dependents {} {
+    db_multirow -extend {export_vars} dependents select_dependents {
+	select r.viol_rel_id as rel_id,
+               (select pretty_name from acs_object_types
+                where object_type = r.viol_rel_type) as rel_type_pretty_name,
+	       acs_object.name(r.viol_object_id_one) as object_id_one_name,
+	       acs_object.name(r.viol_object_id_two) as object_id_two_name
+	  from rc_violations_by_removing_rel r
+	 where r.rel_id = :rel_id
+    } {
         set export_vars [export_vars {rel_id return_url}]
     }
     ad_return_template remove-dependents-exist