Index: openacs-4/packages/acs-subsite/www/admin/relations/one-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/Attic/one-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/relations/one-oracle.xql	15 May 2001 16:59:01 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-<fullquery name="select_rel_info">      
-      <querytext>
-      
-    select r.rel_type, acs_object_type.pretty_name(t.rel_type) as rel_type_pretty_name,
-           acs_rel_type.role_pretty_name(t.role_one) as role_one_pretty_name,
-           acs_rel_type.role_pretty_name(t.role_two) as role_two_pretty_name,
-           t.object_type_two as object_type_two,
-           acs_object.name(r.object_id_one) as object_id_one_name,
-           r.object_id_one,
-           acs_object.name(r.object_id_two) as object_id_two_name,
-           r.object_id_two
-      from acs_rels r, acs_rel_types t
-     where r.rel_id = :rel_id
-       and r.rel_type = t.rel_type
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-subsite/www/admin/relations/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/Attic/one-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/relations/one-postgresql.xql	15 May 2001 16:59:01 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<fullquery name="select_rel_info">      
-      <querytext>
-      
-    select r.rel_type, acs_object_type__pretty_name(t.rel_type) as rel_type_pretty_name,
-           acs_rel_type__role_pretty_name(t.role_one) as role_one_pretty_name,
-           acs_rel_type__role_pretty_name(t.role_two) as role_two_pretty_name,
-           t.object_type_two as object_type_two,
-           acs_object__name(r.object_id_one) as object_id_one_name,
-           r.object_id_one,
-           acs_object__name(r.object_id_two) as object_id_two_name,
-           r.object_id_two
-      from acs_rels r, acs_rel_types t
-     where r.rel_id = :rel_id
-       and r.rel_type = t.rel_type
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-subsite/www/admin/relations/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/relations/one.tcl	7 Jun 2018 17:46:16 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/relations/one.tcl	20 Jun 2018 08:03:54 -0000	1.7
@@ -45,12 +45,27 @@
 
 set subsite_group_id [application_group::group_id_from_package_id]
 
-if { ![db_0or1row select_rel_info {} -column_array rel]
-} {
+if { ![db_0or1row select_rel_info {
+    select r.rel_type,
+           (select pretty_name from acs_object_types
+             where object_type = t.rel_type) as rel_type_pretty_name,
+           (select pretty_name from acs_rel_roles
+             where role = t.role_one) as role_one_pretty_name,
+           (select pretty_name from acs_rel_roles
+             where role = t.role_two) as role_two_pretty_name,
+           t.object_type_two as object_type_two,
+           r.object_id_one,
+           r.object_id_two
+      from acs_rels r, acs_rel_types t
+     where r.rel_id = :rel_id
+       and r.rel_type = t.rel_type
+} -column_array rel] } {
     ad_return_error "Error" "Relation #rel_id does not exist"
     ad_script_abort
 }
 
+set rel(object_id_one_name) [acs_object_name $rel(object_id_one)]
+set rel(object_id_two_name) [acs_object_name $rel(object_id_two)]
 set rel(rel_type_enc) [ad_urlencode $rel(rel_type)]
 set rel(role_one_pretty_name) [lang::util::localize $rel(role_one_pretty_name)]
 set rel(role_two_pretty_name) [lang::util::localize $rel(role_two_pretty_name)]
@@ -69,11 +84,10 @@
 
 # Membership relations have a member_state.  Composition relations don't.
 # This query will return null if the relation is not a membership relation.
-set member_state ""
-db_0or1row select_member_state {
+set member_state [db_string select_member_state {
     select member_state from membership_rels
     where rel_id = :rel_id
-}
+} -default ""]
 
 # Data used to build the "toggle member state" widget.
 set return_url [ad_conn url]?[ad_conn query]
@@ -91,8 +105,6 @@
         $rel(object_id_two)
 }
 
-ad_return_template
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4