Index: openacs-4/packages/contacts/lib/contacts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.tcl,v
diff -u -r1.51 -r1.52
--- openacs-4/packages/contacts/lib/contacts.tcl	1 Apr 2006 22:27:26 -0000	1.51
+++ openacs-4/packages/contacts/lib/contacts.tcl	3 Apr 2006 03:46:22 -0000	1.52
@@ -278,15 +278,15 @@
 #	    set default_attr_extend [parameter::get -parameter "DefaultPersonOrganAttributeExtension"]
 	}
     }
+} else {
+    set object_type "party"
 }
-
 set actions [list]
 if { $admin_p && [exists_and_not_null search_id] } {
     set actions [list "[_ contacts.Set_default_extend]" "admin/ext-search-options?search_id=$search_id" "[_ contacts.Set_default_extend]" ]
 }
 
 
-
 template::multirow create ext impl type type_pretty key key_pretty
 
 # permissions for what attributes/extensions are visible to this
@@ -296,7 +296,8 @@
 callback contacts::extensions \
     -user_id [ad_conn user_id] \
     -multirow ext \
-    -package_id [ad_conn package_id]
+    -package_id [ad_conn package_id] \
+    -object_type $object_type
 
 
 set add_columns [list]
Index: openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	1 Apr 2006 07:07:16 -0000	1.31
+++ openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	3 Apr 2006 03:46:22 -0000	1.32
@@ -70,6 +70,7 @@
     {-multirow}
     {-user_id}
     {-package_id}
+    {-object_type "party"}
 } {
 } -
 
@@ -629,6 +630,7 @@
     {-multirow}
     {-user_id}
     {-package_id}
+    {-object_type}
 } {
 } {
 
@@ -645,33 +647,44 @@
 	if { ![permission::permission_p -object_id $group_id -party_id $user_id -privilege read] } {
 	    continue
 	}
-	set list_id [ams::list::get_list_id \
-			 -package_key "contacts" \
-			 -object_type "person" \
-			 -list_name "${package_id}__${group_id}"]
-	if { $list_id ne "" } {
-	    lappend list_ids $list_id
+	if { $object_type ne "organization" } {
+	    set list_id [ams::list::get_list_id \
+			     -package_key "contacts" \
+			     -object_type "person" \
+			     -list_name "${package_id}__${group_id}"]
+	    if { $list_id ne "" } {
+		lappend list_ids $list_id
+	    }
 	}
-	set list_id [ams::list::get_list_id \
-			 -package_key "contacts" \
-			 -object_type "organization" \
-			 -list_name "${package_id}__${group_id}"]
-	if { $list_id ne "" } {
-	    lappend list_ids $list_id
+	if { $object_type ne "person" } {
+	    set list_id [ams::list::get_list_id \
+			     -package_key "contacts" \
+			     -object_type "organization" \
+			     -list_name "${package_id}__${group_id}"]
+	    if { $list_id ne "" } {
+		lappend list_ids $list_id
+	    }
 	}
     }
 
     if { [llength $list_ids] == 0 } {
 	return {}
     }
 
+    if { $object_type ne "party" } {
+	set object_type_clause "and object_type in ('party','${object_type}')"
+    } else {
+	set object_type_clause ""
+    }
+
     set attr_list [db_list_of_lists get_all_attributes "
 select pretty_name, object_type, attribute_name, widget
   from ams_attributes
  where attribute_id in ( select attribute_id
                            from ams_list_attribute_map
                           where list_id in ([template::util::tcl_to_sql_list $list_ids])
                        )
+   $object_type_clause
    and not deprecated_p
     "]
 
Index: openacs-4/packages/contacts/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/contacts/www/search.tcl	1 Apr 2006 07:07:16 -0000	1.26
+++ openacs-4/packages/contacts/www/search.tcl	3 Apr 2006 03:46:23 -0000	1.27
@@ -91,7 +91,8 @@
     callback contacts::extensions \
 	-user_id [ad_conn user_id] \
 	-multirow ext \
-	-package_id [ad_conn package_id]
+	-package_id [ad_conn package_id] \
+	-object_type $object_type
     
     set add_columns [list]
     set remove_columns [list]