Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	26 Mar 2002 21:30:41 -0000	1.5
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	27 Mar 2002 22:17:20 -0000	1.6
@@ -10,7 +10,7 @@
     <if @read_private_data_p@ eq 1 or @user_id@ eq @users.user_id@>
       (<a href="mailto:@users.email@">@users.email@</a>)
     </if>
-      <i><%= [dotlrn_community::get_role_pretty_name_from_rel_type -rel_type $users(rel_type)] %></i>
+      <i>@users.role@</i>
 
     <if @admin_p@ eq 1>
       <small>[<a href="deregister?user_id=@users.user_id@&amp;referer=members">deregister</a>]</small>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl	26 Mar 2002 21:31:01 -0000	1.3
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl	27 Mar 2002 22:17:20 -0000	1.4
@@ -12,8 +12,8 @@
 array set config $cf	
 
 set user_id [ad_conn user_id]
-set  referer [ad_conn url]
-set community_id [dotlrn_community::get_community_id]
+set referer [ad_conn url]
+set community_id $config(community_id)
 
 set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id $community_id]
 set read_private_data_p [dotlrn::user_can_read_private_data_p $user_id]
@@ -22,5 +22,3 @@
 template::util::list_of_ns_sets_to_multirow \
     -rows [dotlrn_community::list_users $community_id] \
     -var_name "users"
-
-ad_return_template
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	18 Mar 2002 17:58:44 -0000	1.5
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	27 Mar 2002 22:17:20 -0000	1.6
@@ -1,70 +1,64 @@
-<if @config.shaded_p@ ne "t">
-<br>
+<!-- aks: shading is broken for this portlet -->
 
 Professors:
-<ul>
-  <if @dotlrn_instructor_rel:rowcount@ gt 0>
-  <multiple name="dotlrn_instructor_rel">
-  
-  <li>
-       @dotlrn_instructor_rel.member_link@
-       <if @read_private_data_p@ eq 1 or @user_id@ eq @dotlrn_instructor_rel.user_id@>
-         (<a href="mailto:@dotlrn_instructor_rel.email@">@dotlrn_instructor_rel.email@</a>)
-       </if>
-    </li>
-  </multiple>
+  <ul>
+  <if @n_profs@ gt 0>
+    <multiple name="users">
+      <if @users.rel_type@ eq "dotlrn_instructor_rel">
+      <li>     
+        <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
+        <if @read_private_data_p@ eq 1 or @user_id@ eq @users.user_id@>
+          (<a href="mailto:@users.email@">@users.email@</a>)
+        </if>
+      </if>
+    </multiple>
   </if>
   <else>
-    <small>No Professors</small>
+    <li><small>No Professors</small>
   </else>
-</ul>
+  </ul>
 
-<P>
+<p>
 
 Teaching Assistants:
-<ul>
-  <if @dotlrn_ta_rel:rowcount@ gt 0>
-  <multiple name="dotlrn_ta_rel">
-    <li>
-      <%= [acs_community_member_link \
-         -user_id $dotlrn_ta_rel(user_id) \
-         -label "$dotlrn_ta_rel(first_names) \
-          $dotlrn_ta_rel(last_name)"] \
-       %>
-       <if @read_private_data_p@ eq 1 or @user_id@ eq @dotlrn_ta_rel.user_id@>
-         (<a href="mailto:@dotlrn_ta_rel.email@">@dotlrn_ta_rel.email@</a>)
-       </if>
-    </li>
-  </multiple>
+  <ul>
+  <if @n_tas@ gt 0>
+    <multiple name="users">
+      <if @users.rel_type@ eq "dotlrn_ta_rel">
+      <li>     
+        <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
+        <if @read_private_data_p@ eq 1 or @user_id@ eq @users.user_id@>
+          (<a href="mailto:@users.email@">@users.email@</a>)
+        </if>
+      </if>
+    </multiple>
   </if>
   <else>
-    <small>No Teaching Assistants</small>
+    <li><small>No Teaching Assistants</small>
   </else>
-</ul>
+  </ul>
 
+<p>
+
 Course Assistants:
-<ul>
-  <if @dotlrn_ca_rel:rowcount@ gt 0>
-  <multiple name="dotlrn_ca_rel">
-    <li>
-      <%= [acs_community_member_link \
-         -user_id $dotlrn_ca_rel(user_id) \
-         -label "$dotlrn_ca_rel(first_names) \
-          $dotlrn_ca_rel(last_name)"] \
-       %>
-       <if @read_private_data_p@ eq 1 or @user_id@ eq @dotlrn_ca_rel.user_id@>
-         (<a href="mailto:@dotlrn_ca_rel.email@">@dotlrn_ca_rel.email@</a>)
-       </if>
-    </li>
-  </multiple>
+  <ul>
+  <if @n_cas@ gt 0>
+    <multiple name="users">
+      <if @users.rel_type@ eq "dotlrn_ca_rel">
+      <li>     
+        <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
+        <if @read_private_data_p@ eq 1 or @user_id@ eq @users.user_id@>
+          (<a href="mailto:@users.email@">@users.email@</a>)
+        </if>
+      </if>
+    </multiple>
   </if>
   <else>
-    <small>No Course Assistants</small>
+    <li><small>No Course Assistants</small>
   </else>
-</ul>
+  </ul>
 
-
 <br>
 
 <a href=members>Student List</a>
-</if>
+
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl	12 Mar 2002 05:16:34 -0000	1.3
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl	27 Mar 2002 22:17:20 -0000	1.4
@@ -13,33 +13,32 @@
 
 set user_id [ad_conn user_id]
 set referer [ad_conn url]
-set community_id [dotlrn_community::get_community_id]
+set community_id $config(community_id)
 
 set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id $community_id]
 set read_private_data_p [dotlrn::user_can_read_private_data_p $user_id]
 
-# Get all users for this community, including role
-set rel_types_list [dotlrn_community::get_allowed_rel_types -community_id $community_id]
+# get all the users in a list of ns_sets
+set all_users_list [dotlrn_community::list_users $community_id]
 
-foreach rel_type $rel_types_list {
-    
-    set rel_pn [dotlrn_community::get_role_pretty_name_from_rel_type \
-            -rel_type $rel_type]
-    
-    template::multirow create $rel_type rel_id rel_type user_id first_names last_name email member_link
-    
-    set list_of_users \
-            [dotlrn_community::list_users_in_role \
-            -rel_type $rel_type $community_id]
-    
-    foreach user $list_of_users {
-        template::multirow append $rel_type \
-                [lindex $user 0] \
-                $rel_pn \
-                [lindex $user 2] \
-                [lindex $user 3] \
-                [lindex $user 4] \
-                [lindex $user 5] \
-                [acs_community_member_link -user_id [lindex $user 2] -label "[lindex $user 3] [lindex $user 4]"]  
+set n_profs 0
+set n_tas 0 
+set n_cas 0 
+
+# count how many of some types
+foreach one_user_set $all_users_list {
+    if {[string equal [ns_set get $one_user_set rel_type] "dotlrn_instructor_rel"]} {
+        incr n_profs
+    } elseif {[string equal [ns_set get $one_user_set rel_type] "dotlrn_ta_rel"]} {
+        incr n_tas
+    } elseif {[string equal [ns_set get $one_user_set rel_type] "dotlrn_ca_rel"]} {
+        incr n_cas
     }
 }
+
+# stuff into a multirow
+template::util::list_of_ns_sets_to_multirow \
+    -rows $all_users_list \
+    -var_name "users"
+
+