Fisheye: Tag 1.1.32.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl 21 Jan 2018 00:35:29 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl 3 Sep 2019 11:28:56 -0000 1.6.2.1 @@ -19,7 +19,10 @@ set user_id [ad_conn user_id] set package_id [ad_conn package_id] -set context [list [list "" "Relationship types"] [[export_vars -base one rel_type] "One type"] "Relations"] +set context [list \ + [list "" "Relationship types"] \ + [list [export_vars -base one rel_type] "One type"] \ + "Relations"] if { ![db_0or1row select_pretty_name { select t.pretty_name as rel_type_pretty_name @@ -32,7 +35,16 @@ ad_script_abort } -db_multirow rels rels_select {} +db_multirow rels rels_select { + select r.rel_id, + acs_object.name(r.object_id_one) || ' and ' || acs_object.name(r.object_id_two) as name + from acs_rels r, app_group_distinct_rel_map m + where r.rel_type = :rel_type + and m.rel_id = r.rel_id + and m.package_id = :package_id + and acs_permission.permission_p(r.rel_id, :user_id, 'read') + order by lower(acs_object.name(r.object_id_one) || ' and ' || acs_object.name(r.object_id_two)) +} ad_return_template