Index: openacs-4/packages/contacts/www/contact-rels-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-rels-postgresql.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/contacts/www/contact-rels-postgresql.xql 24 Mar 2006 13:15:28 -0000 1.7 +++ openacs-4/packages/contacts/www/contact-rels-postgresql.xql 3 May 2006 21:28:06 -0000 1.8 @@ -37,7 +37,9 @@ where acs_rels.rel_type = acs_rel_types.rel_type and ( object_id_one = :party_id or object_id_two = :party_id ) and acs_rels.rel_type in ( select object_type from acs_object_types where supertype = 'contact_rel') -) rels_temp +) rels_temp, group_distinct_member_map + where rels_temp.other_party_id = group_distinct_member_map.member_id + and group_distinct_member_map.group_id in ([template::util::tcl_to_sql_list [contacts::default_groups]]) [template::list::orderby_clause -orderby -name "relationships"] @@ -54,7 +56,7 @@ ( select name from organizations where organization_id = party_id ) as organization from parties left join cr_items on (parties.party_id = cr_items.item_id) left join cr_revisions on (cr_items.latest_revision = cr_revisions.revision_id ) , group_distinct_member_map where parties.party_id = group_distinct_member_map.member_id - and group_distinct_member_map.group_id in ('[join [contacts::default_groups] "','"]') + and group_distinct_member_map.group_id in ([template::util::tcl_to_sql_list [contacts::default_groups]]) $type_clause [contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"] order by upper(contact__name(parties.party_id))