Index: openacs-4/packages/dotlrn/www/member-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-3.tcl,v
diff -u -r1.7.6.3 -r1.7.6.4
--- openacs-4/packages/dotlrn/www/member-add-3.tcl	5 Oct 2004 13:21:11 -0000	1.7.6.3
+++ openacs-4/packages/dotlrn/www/member-add-3.tcl	6 Oct 2004 12:43:36 -0000	1.7.6.4
@@ -22,25 +22,23 @@
     @creation-date 2001-11-04
     @version $Id$
 } -query {
-    {user_id:multiple,notnull}
+    user_id:multiple
     rel_type
     {referer "one-community-admin"}
 }
 
 set community_id [dotlrn_community::get_community_id]
-
+# See if the user is already in the group
 foreach uid $user_id {
-    
-    # See if the user is already in the group
     set member_p [dotlrn_community::member_p $community_id $uid]
-    
+
     if {$member_p} {
 	dotlrn_community::remove_user $community_id $uid
     }
     
+    
     # Add the relation
     dotlrn_community::add_user -rel_type $rel_type $community_id $uid
-
-}    
+}
 ad_returnredirect $referer
 
Index: openacs-4/packages/dotlrn/www/members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v
diff -u -r1.20.6.3 -r1.20.6.4
--- openacs-4/packages/dotlrn/www/members.adp	5 Oct 2004 13:35:38 -0000	1.20.6.3
+++ openacs-4/packages/dotlrn/www/members.adp	6 Oct 2004 12:43:36 -0000	1.20.6.4
@@ -27,6 +27,7 @@
 </form>
 </if>
 
+
 <listtemplate name="members"></listtemplate>
 
 <if @admin_p@ eq 1 and @pending_users:rowcount@ gt 0>
@@ -71,43 +72,6 @@
   </blockquote>
 
 <formtemplate id="parent_users_form">
-  <table width="75%" border="0">
-
-    <tr>
-      <td width="15%" align="center"><strong>#dotlrn.Dont_Add#</strong></td>
-      <td width="15%" align="center"><strong>#dotlrn.Member#</strong></td>
-      <td width="15%"
-      align="center"><strong>#dotlrn.Administrator#</strong></td>
-      <td>&nbsp;</td>
-    </tr>
-
-<%
-    foreach user $parent_user_list {
-        set this_user_id [ns_set get $user user_id]
-        set this_first_names [ns_set get $user first_names]
-        set this_last_name [ns_set get $user last_name]
-        set this_email [ns_set get $user email]
-%>
-
-    <tr>
-<formgroup id="selected_user.@this_user_id@" cols="3">
-      <td width="15%" align="center">@formgroup.widget;noquote@</td>
-</formgroup>
-      <td>@this_last_name@, @this_first_names@ (@this_email@)</td>
-    </tr>
-
-<%
-    }
-%>
-
-    <tr><td colspan="4">&nbsp;</td></tr>
-
-    <tr>
-      <td><input type="submit" value="#dotlrn.add_selected_members#"></td>
-      <td colspan="3">&nbsp;</td>
-    </tr>
-
-  </table>
 </formtemplate>
 
 </if>
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.19.6.7 -r1.19.6.8
--- openacs-4/packages/dotlrn/www/members.tcl	5 Oct 2004 16:58:04 -0000	1.19.6.7
+++ openacs-4/packages/dotlrn/www/members.tcl	6 Oct 2004 12:43:36 -0000	1.19.6.8
@@ -108,8 +108,10 @@
 	    label "[_ dotlrn.Actions]"
 	    html "align left"
 	    display_template {
+		<if @members.user_id@ ne "">
 		<a href="deregister?user_id=@members.user_id@&referer=@members.referer@">#dotlrn.Drop_Membership#</a> | 
 		<a href="member-add-2?user_id=@members.user_id@&referer=@members.referer@">#dotlrn.User_Admin_Page#</a>
+		</if>
 	    }
 	}
     } -orderby {
@@ -121,10 +123,6 @@
 	csv { output csv }
     }
 
-
-if { [exists_and_not_null orderby] } {
-}
-
 set orderby [template::list::orderby_clause -name "members" -orderby]
 
 db_multirow -extend { member_url referer } members select_current_members {} {
@@ -137,16 +135,20 @@
     template::list::write_output -name members
 }
 
-db_multirow pending_users select_pending_users {
-    select dotlrn_users.*,
-           dotlrn_member_rels_full.rel_type,
-           dotlrn_member_rels_full.role
-    from dotlrn_users,
-         dotlrn_member_rels_full
-    where dotlrn_users.user_id = dotlrn_member_rels_full.user_id
-    and dotlrn_member_rels_full.community_id = :community_id
-    and dotlrn_member_rels_full.member_state = 'needs approval'
-} {
+# Bulk action User Admin Page
+# Depending on the community_type, we have allowable rel_types
+set rel_types [dotlrn_community::get_roles -community_id $community_id]
+set selection "<select name=\"rel_type\">"
+foreach role $rel_types {
+    append selection "<option value=\"[lindex $role 0]\">[lang::util::localize [lindex $role 2]]</option>"
+}
+append selection "</select>"
+set size [multirow size members]
+if { $size > 0 } {
+    multirow append members "" "" "" "" "" $selection
+}
+
+db_multirow pending_users select_pending_users {} {
     set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]
 }
 
@@ -180,7 +182,7 @@
 
 if {[exists_and_not_null reset] && [exists_and_not_null reltype]} {
 set result ""
-    db_multirow reset_members select_members {select user_id as member_id from dotlrn_member_rels_approved where community_id = :community_id and rel_type = :reltype and user_id <> :my_user_id} {
+    db_multirow reset_members select_members {} {
 	rp_form_put user_id $member_id
     }
     rp_form_put referer "one-community"
Index: openacs-4/packages/dotlrn/www/members.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ