Index: openacs-4/packages/dotlrn-catalog/www/admin/grant-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/admin/grant-list.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn-catalog/www/admin/grant-list.tcl	16 Feb 2005 22:21:30 -0000	1.3
+++ openacs-4/packages/dotlrn-catalog/www/admin/grant-list.tcl	2 Nov 2005 20:30:22 -0000	1.4
@@ -6,14 +6,12 @@
     @creation-date   28-01-2005
 } {
     { return_url "" }
-    { user_name "" }
-    { user_email "" }
-
+    { keyword "" }
 }
 
 set user_id [ad_conn user_id]
 # dotlrn-catalog package_id
-set cc_package_id [apm_package_id_from_key "dotlrn-catalog"]
+set cc_package_id [ad_conn package_id]
 
 set page_title "[_ dotlrn-catalog.grant_list]"
 if {[string equal $return_url ""]} {
@@ -24,31 +22,14 @@
 
 # To search for users
 ad_form -name search_user -form {
-    {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], [_ 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 $cc_package_id -privilege "create"]
     if { [catch { set email [email_image::get_user_email -user_id $p_user_id] } errmsg] } {
 	set email $db_email
@@ -65,8 +46,7 @@
 		       "\#dotlrn-catalog.revoke\#" "revoke-users?" "\#dotlrn-catalog.revoke_per\#" }\
     -bulk_action_method post \
     -bulk_action_export_vars {
-	user_name
-	user_email
+	keyword
     }\
     -row_pretty_plural "[_ dotlrn-catalog.users_to_grant]" \
     -elements {