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/one-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/one-oracle.xql 7 Aug 2017 23:47:58 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one-oracle.xql 20 Jun 2018 09:29:09 -0000 1.3 @@ -3,19 +3,6 @@ oracle8.1.6 - - - - select s.segment_id, s.segment_name, s.group_id, acs_object.name(s.group_id) as group_name, - s.rel_type, acs_object_type.pretty_name(r.rel_type) as rel_type_pretty_name, - acs_rel_type.role_pretty_plural(r.role_two) as role_pretty_plural - from rel_segments s, acs_rel_types r - where s.segment_id = :segment_id - and s.rel_type = r.rel_type - - - - @@ -30,6 +17,5 @@ - 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/one-postgresql.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/one-postgresql.xql 7 Aug 2017 23:47:58 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one-postgresql.xql 20 Jun 2018 09:29:09 -0000 1.5 @@ -3,19 +3,6 @@ postgresql7.1 - - - - select s.segment_id, s.segment_name, s.group_id, acs_object__name(s.group_id) as group_name, - s.rel_type, acs_object_type__pretty_name(r.rel_type) as rel_type_pretty_name, - acs_rel_type__role_pretty_plural(r.role_two) as role_pretty_plural - from rel_segments s, acs_rel_types r - where s.segment_id = :segment_id - and s.rel_type = r.rel_type - - - - @@ -27,5 +14,4 @@ - 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 -N -r1.9 -r1.10 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl 7 Jun 2018 17:41:01 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl 20 Jun 2018 09:29:09 -0000 1.10 @@ -30,7 +30,21 @@ set context [list [list "./" "Relational segments"] "One segment"] -if { ![db_0or1row select_segment_properties {} -column_array props] } { +if { ![db_0or1row select_segment_properties { + select s.segment_id, + s.segment_name, + s.group_id, + (select group_name from groups + where group_id = s.group_id) as group_name, + s.rel_type, + (select pretty_name from acs_object_types + where object_type = r.rel_type) as rel_type_pretty_name, + (select pretty_plural from acs_rel_roles + where role = r.role_two) as role_pretty_plural + from rel_segments s, acs_rel_types r + where s.segment_id = :segment_id + and s.rel_type = r.rel_type +} -column_array props] } { ad_return_error \ "Segment does not exist" \ "Segment $segment_id does not exist"