Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/grant-user-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/grant-user-list.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/grant-user-list.tcl	16 Feb 2005 22:21:30 -0000	1.2
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/grant-user-list.tcl	4 Jul 2005 21:20:35 -0000	1.2.2.1
@@ -7,16 +7,15 @@
     @creation date   03-01-2005
 } {
     { return_url "" }
-    { user_name "" }
-    { user_email "" }
+    { keyword "" }
     course_key:notnull
     object_id:notnull
     creation_user:notnull
 }
 
 # Check for create permissions over dotlrn-catalog
 set user_id [ad_conn user_id]
-set cc_package_id [apm_package_id_from_key "dotlrn-catalog"]
+set cc_package_id [ad_conn package_id]
 permission::require_permission -party_id $user_id -object_id $cc_package_id -privilege "create"
 
 set page_title "[_ dotlrn-catalog.search_users_to] $course_key"
@@ -36,30 +35,13 @@
     {course_key:text(hidden)
 	{value "$course_key"}
     }
-    {user_name:text(text),optional
+    {keyword:text(text),optional
 	{label "[_ dotlrn-catalog.search_user]"}
-	{help_text "[_ dotlrn-catalog.search_help]"}
+	{help_text "[_ dotlrn-catalog.search_help] or [_ dotlrn-catalog.search_email_help]"}
     }
-    {user_email:text(text),optional
-	{label "[_ dotlrn-catalog.search_user_email]"}
-	{help_text "[_ dotlrn-catalog.search_email_help]"}
-    }
 }
 
-# Establish what query to use in order to the values of the form elements
-if {![string equal $user_name ""]} {
-    set query select_users_name
-    if {![string equal $user_email ""]} {
-	set query select_users_name_email
-    }
-} else {
-    set query select_users
-    if {![string equal $user_email ""]} {
-	    set query select_users_email
-    }
-}
-
-db_multirow -extend { privilege email } grant_list $query {} {
+db_multirow -extend { privilege email } grant_list select_users_name_email {} {
     set privilege [permission::permission_p -party_id $p_user_id -object_id $object_id -privilege "admin"]
     if { [catch { set email [email_image::get_user_email -user_id $p_user_id] } errmsg] } {
 	set email $db_email
@@ -76,8 +58,7 @@
 		       "\#dotlrn-catalog.revoke\#" "revoke-permission" "\#dotlrn-catalog.revoke_per\#" }\
     -bulk_action_method post \
     -bulk_action_export_vars {
-	user_name
-	user_email
+	keyword
 	object_id
 	creation_user
 	course_key