Index: openacs-4/packages/contacts/www/admin/relationships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/relationships.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/admin/relationships.tcl	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/admin/relationships.tcl	21 May 2005 21:00:41 -0000	1.2
@@ -19,17 +19,19 @@
 set context [list $title]
 
 set package_id [ad_conn package_id]
-
+set url [ad_conn url]
 # Select out all relationship types, excluding the parent type names 'relationship'
 # Count up the number of relations that exists for each type.
-db_multirow -extend { primary_type_pretty secondary_type_pretty } rel_types get_rels {
+db_multirow -extend { primary_type_pretty secondary_type_pretty rel_form_url } rel_types get_rels {
 
 select CASE WHEN primary_object_type = 'party' THEN '1' WHEN primary_object_type = 'person' THEN '2' ELSE '3' END as sort_one,
        CASE WHEN secondary_object_type = 'party' THEN '2' WHEN secondary_object_type = 'person' THEN '3' ELSE '4' END as sort_two,
        acs_rel_type__role_pretty_name(primary_role) as primary_role_pretty,
        acs_rel_type__role_pretty_name(secondary_role) as secondary_role_pretty,
-       *
-  from contact_rel_types
+       contact_rel_types.*,
+       acs_object_types.pretty_name
+  from contact_rel_types, acs_object_types
+ where contact_rel_types.rel_type = acs_object_types.object_type
 order by sort_one, sort_two, primary_role_pretty
 
 } {
@@ -43,6 +45,13 @@
         organization    { set secondary_type_pretty "Organization" }
         person          { set secondary_type_pretty "Person" }
     }
+    set rel_form_url [ams::list::url \
+                          -package_key "contacts" \
+                          -object_type ${rel_type} \
+                          -list_name ${package_id} \
+                          -pretty_name ${pretty_name} \
+                          -return_url ${url} \
+                          -return_url_label "Return to \"$title\""]
 
 }
 ad_return_template