Index: openacs-4/packages/courses/www/cc-admin/grant-user-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/grant-user-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/www/cc-admin/grant-user-list.tcl	2 Feb 2005 23:07:50 -0000	1.2
+++ openacs-4/packages/courses/www/cc-admin/grant-user-list.tcl	3 Feb 2005 22:41:28 -0000	1.3
@@ -1,56 +1,82 @@
 ad_page_contract {
-    Displays a list of all proffesors from dotlrn
+    Displays a list of all users that have create privile under course_catalog
+    to give them admin privileges over course_id and assessment_id
 
-    @author          Miguel Marin (miguelmarin@viaro.net) Viaro Networks (www.viaro.net)
-    @creation date   28-01-2005
+    @author          Miguel Marin (miguelmarin@viaro.net) 
+    @author          Viaro Networks www.viaro.net
+    @creation date   03-01-2005
 } {
     { return_url "" }
     { user_name "" }
     { user_email "" }
+    course_key:notnull
+    object_id:notnull
+    creation_user:notnull
 }
 
 set user_id [auth::get_user_id]
 # course_catalog package_id
 set cc_package_id [apm_package_id_from_key "courses"]
 
-set page_title "[_ courses.search_u]"
+set page_title "[_ courses.search_users_to] $course_key"
 set context [list [list "/courses/cc-admin/grant-list" "[_ courses.grant] [_ courses.course_list]"] "[_ courses.search_u]"]
 if {[string equal $return_url ""]} {
     set return_url "/courses/admin/grant-list"
 }
 
-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
-    }
-}
-
 # To search for users
 ad_form -name search_user -form {
+    {object_id:text(hidden)
+	{value "$object_id"}
+    }
+    {creation_user:text(hidden)
+	{value "$creation_user"}
+    }
+    {course_key:text(hidden)
+	{value "$course_key"}
+    }
     {user_name:text(text),optional
 	{label "[_ courses.search_user]"}
 	{help_text "[_ courses.search_help]"}
     }
     {user_email:text(text),optional
 	{label "[_ courses.search_user_email]"}
+	{help_text "[_ courses.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 {} {
-    set privilege [permission::permission_p -party_id $p_user_id -object_id $cc_package_id -privilege "create"]
+    set privilege [permission::permission_p -party_id $p_user_id -object_id $object_id -privilege "admin"]
     set email [email_image::get_user_email -user_id $p_user_id]
 }
 
 template::list::create \
-    -name grant_list \
+	-name grant_list \
     -multirow grant_list \
     -key p_user_id \
+    -bulk_actions {"\#courses.grant\#" "grant-permission" "\#courses.grant_per\#"\
+		       "\#courses.revoke\#" "revoke-permission" "\#courses.revoke_per\#" }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	user_name
+	user_email
+	object_id
+	creation_user
+	course_key
+    }\
     -row_pretty_plural "[_ courses.users_to_grant]" \
     -elements {
 	name {
@@ -69,10 +95,10 @@
 	    label "[_ courses.permission]"
 	    display_template {
 		<if @grant_list.privilege@ eq 1>
-		   [_ courses.granted]
+		[_ courses.granted]
 		</if>
 		<else>
-		   <i>[_ courses.not_allowed]</i>
+		<i>[_ courses.not_allowed]</i>
 		</else>
 	    }
 	}