Index: openacs-4/packages/dotlrn/www/admin/user-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/user-oracle.xql	16 Mar 2002 02:02:07 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/user-oracle.xql	19 Mar 2002 01:23:15 -0000	1.3
@@ -63,4 +63,20 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="select_member_subgroups">
+        <querytext>
+            select dotlrn_communities.*,
+                   dotlrn_community.url(dotlrn_communities.community_id) as url,
+                   dotlrn_member_rels_approved.role,
+                   acs_permission.permission_p(dotlrn_communities.community_id, :user_id, 'admin') as admin_p
+            from dotlrn_communities,
+                 dotlrn_member_rels_approved
+            where dotlrn_member_rels_approved.user_id = :user_id
+            and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id
+            and dotlrn_communities.community_type = 'dotlrn_community'
+            order by dotlrn_communities.pretty_name,
+                     dotlrn_communities.community_key
+        </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/user.adp	18 Mar 2002 04:59:39 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/user.adp	19 Mar 2002 01:23:15 -0000	1.5
@@ -119,6 +119,21 @@
   </blockquote>
 </if>
 
+<if @member_subgroups:rowcount@ gt 0>
+  <blockquote>
+    <h4><%= [ad_parameter "subcommunities_pretty_name"] %> Memberships</h4>
+
+    <ul>
+<multiple name="member_subgroups">
+      <li>
+        <a href="@member_subgroups.url@">@member_subgroups.pretty_name@</a>
+        (@member_subgroups.role@)
+      </li>
+</multiple>
+    </ul>
+  </blockquote>
+</if>
+
   <ul>
     <li>
       <a
Index: openacs-4/packages/dotlrn/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/user.tcl	14 Mar 2002 05:40:14 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	19 Mar 2002 01:23:15 -0000	1.2
@@ -18,7 +18,11 @@
     export_edit_vars:onevalue
     portrait_p:onevalue
     portrait_title:onevalue
-    user_finite_state_links:onevalue
+    change_state_links:onevalue
+    return_url:onevalue
+    dotlrn_user_p:onevalue
+    member_classes:multirow
+    member_clubs:multirow
 }
 
 set return_url "[ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberAdminURL]?user_id=$user_id"
@@ -52,5 +56,6 @@
 
 db_multirow member_classes select_member_classes {}
 db_multirow member_clubs select_member_clubs {}
+db_multirow member_subgroups select_member_subgroups {}
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/user.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/user.xql	14 Mar 2002 05:40:14 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/user.xql	19 Mar 2002 01:23:15 -0000	1.2
@@ -18,35 +18,4 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="select_direct_group_membership">
-        <querytext>
-            select group_id,
-                   rel_id,
-                   party_names.party_name as group_name
-            from (select /*+ ORDERED */ distinct rels.rel_id,
-                         object_id_one as group_id, 
-                         object_id_two
-                  from acs_rels rels, all_object_party_privilege_map perm
-                  where perm.object_id = rels.rel_id
-                  and perm.privilege = 'read'
-                  and rels.rel_type = 'membership_rel'
-                  and rels.object_id_two = :user_id) r, 
-                 party_names 
-            where r.group_id = party_names.party_id
-            order by lower(party_names.party_name)
-        </querytext> 
-    </fullquery>
-
-    <fullquery name="select_all_group_membership">
-        <querytext>
-            select groups.group_id,
-                   groups.group_name
-            from groups,
-                 group_member_map gm
-            where groups.group_id = gm.group_id
-            and gm.member_id = :user_id
-            order by lower(groups.group_name)
-        </querytext>
-    </fullquery>
-
 </queryset>