Index: openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql	24 Sep 2005 11:12:38 -0000	1.2
+++ openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql	24 Sep 2005 11:31:47 -0000	1.3
@@ -10,7 +10,6 @@
                 CASE WHEN object_id_one = :party_id THEN role_two ELSE role_one END as role,
                 CASE WHEN object_id_one = :party_id THEN acs_rel_type__role_pretty_name(role_two) ELSE acs_rel_type__role_pretty_name(role_one) END as role_singular,
                 CASE WHEN object_id_one = :party_id THEN acs_rel_type__role_pretty_plural(role_two) ELSE acs_rel_type__role_pretty_name(role_two) END as role_plural,
-                role_one, role_two,
                 acs_rels.rel_id, acs_rels.rel_type
            from acs_rels,
                 acs_rel_types
Index: openacs-4/packages/contacts/lib/contact-relationships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-relationships.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/lib/contact-relationships.tcl	16 Sep 2005 15:38:18 -0000	1.4
+++ openacs-4/packages/contacts/lib/contact-relationships.tcl	24 Sep 2005 11:31:47 -0000	1.5
@@ -27,10 +27,10 @@
 
 db_foreach get_relationships {} {
     set contact_url [contact::url -party_id $other_party_id]
-    if {[organization::organization_p -party_id $party_id]} {
-	set other_object_type "person"
-    } else {
+    if {[organization::organization_p -party_id $other_party_id]} {
 	set other_object_type "organization"
+    } else {
+	set other_object_type "person"
     } 
     set relation_url [export_vars -base "/contacts/add/$other_object_type" -url {{group_ids $default_group} {object_id_two "$party_id"} rel_type}]    
     set role_singular [lang::util::localize $role_singular]