Index: openacs-4/packages/contacts/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.tcl,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/contacts/www/index.tcl	21 Jun 2007 21:11:27 -0000	1.28
+++ openacs-4/packages/contacts/www/index.tcl	25 Jun 2007 16:25:39 -0000	1.29
@@ -83,14 +83,6 @@
     lappend search_options [list "${my_lists_title}" ${my_lists_list_id} [_ contacts.Lists]]
 }
 
-# Include for an Ajax dropdown smart search widget that filters search results as you type.
-# Requires ajaxhelper
-
-set js_update_user_select [ah::ajaxupdate \
-			       -container "results_box"  \
-			       -url "lookup" \
-			       -pars "Form.serialize('search')"]
-
 if { [exists_and_not_null search_id] } {
     set search_in_list_p 0
     foreach search_option $search_options {
@@ -110,7 +102,7 @@
 
 set form_elements {
     {search_id:integer(select_with_optgroup),optional {label ""} {options $search_options} {html {onChange "javascript:acs_FormRefresh('search')"}}}
-    {query:text(text),optional {label ""} {html {size 20 maxlength 255  onKeyUp "$js_update_user_select document.getElementById('results_box').style.visibility='visible';" autocomplete "off" value ""}}}
+    {query:text(text),optional {label ""}}
     {save:text(submit) {label {[_ contacts.Search]}} {value "go"}}
     {results_count:integer(inform),optional {label "&nbsp;&nbsp;<span style=\"font-size: smaller;\">[_ contacts.Results] $contacts_total_count </span>"}}
 }
@@ -124,8 +116,7 @@
     }
 }
 
-if { [contact::group::mapped_p -group_id $search_id] && $contacts_total_count > 0 } {
-    set group [contact::group::name -group_id $search_id]
+if { $search_id ne "" && $contacts_total_count > 0 } {
     set label [_ contacts.Mail_group]
     append form_elements {
 	{mail_merge_group:text(submit) {label $label} {value "1"}}
@@ -138,7 +129,7 @@
     } -on_refresh {
     } -on_submit {
 	if { [exists_and_not_null mail_merge_group] } {
-	    ad_returnredirect [export_vars -base "message" -url {{group_id $search_id}}]
+	    ad_returnredirect [export_vars -base "message" -url {{search_id $search_id}}]
 	    ad_script_abort
 	}
     } -after_submit {