Index: openacs-4/packages/contacts/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/www/index.tcl	12 Jun 2005 21:23:16 -0000	1.9
+++ openacs-4/packages/contacts/www/index.tcl	13 Jun 2005 07:22:36 -0000	1.10
@@ -13,12 +13,18 @@
     {page:optional}
     {page_size:integer "25"}
     {tasks_interval:integer "7"}
+    {add_person:optional}
+    {add_organization:optional}
+    {clear_query:optional}
 }
 
-
-set title "[_ contacts.Contacts]"
-set context {}
-
+if { [exists_and_not_null add_person] } {
+    ad_returnredirect "add/person"
+    ad_script_abort
+} elseif { [exists_and_not_null add_organization] } {
+    ad_returnredirect "add/organization"
+    ad_script_abort
+}
 if { [exists_and_not_null query_id] } {
     if { [contact::search::exists_p -search_id $query_id] } {
         set search_id $query_id
@@ -151,6 +157,14 @@
     }
 }
 
+if { [parameter::get -boolean -parameter "ForceSearchBeforeAdd" -default "0"] } {
+    if { [exists_and_not_null query] && $group_id == "-2" } {
+	append form_elements {
+	    {add_person:text(submit) {label {[_ contacts.Add_Person]}} {value "1"}}
+	    {add_organization:text(submit) {label {[_ contacts.Add_Organization]}} {value "1"}}
+	}
+    }
+}
 
 ad_form -name "search" -method "GET" -export {orderby page_size page format} -form $form_elements \
     -on_request {
@@ -163,4 +177,4 @@
 # Make the Navigation bar context sensitive
 
 set person_add_url [export_vars -base "contact-add" -url {{object_type "person"} group_id}]
-set organization_add_url [export_vars -base "contact-add" -url {{object_type "organization"} group_id}]
\ No newline at end of file
+set organization_add_url [export_vars -base "contact-add" -url {{object_type "organization"} group_id}]