Index: openacs-4/packages/dotlrn/www/manage-memberships-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/manage-memberships-oracle.xql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/manage-memberships-oracle.xql	12 Apr 2002 08:32:11 -0000	1.6
+++ openacs-4/packages/dotlrn/www/manage-memberships-oracle.xql	30 May 2002 02:57:34 -0000	1.7
@@ -17,6 +17,7 @@
         <querytext>
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_full.role,
+                   dotlrn_member_rels_full.rel_type,
                    dotlrn_member_rels_full.member_state,
                    acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
             from dotlrn_class_instances_full,
@@ -32,6 +33,7 @@
         <querytext>
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_full.role,
+                   dotlrn_member_rels_full.rel_type,
                    dotlrn_member_rels_full.member_state,
                    acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
             from dotlrn_class_instances_full,
@@ -48,6 +50,7 @@
         <querytext>
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_full.role,
+                   dotlrn_member_rels_full.rel_type,
                    dotlrn_member_rels_full.member_state,
                    acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
             from dotlrn_class_instances_full,
@@ -64,6 +67,7 @@
         <querytext>
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_full.role,
+                   dotlrn_member_rels_full.rel_type,
                    dotlrn_member_rels_full.member_state,
                    acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
             from dotlrn_class_instances_full,
@@ -81,6 +85,7 @@
         <querytext>
             select dotlrn_clubs_full.*,
                    dotlrn_member_rels_full.role,
+                   dotlrn_member_rels_full.rel_type,
                    dotlrn_member_rels_full.member_state,
                    acs_permission.permission_p(dotlrn_clubs_full.club_id, :user_id, 'admin') as admin_p
             from dotlrn_clubs_full,
Index: openacs-4/packages/dotlrn/www/manage-memberships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	21 May 2002 17:30:02 -0000	1.12
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	30 May 2002 02:57:34 -0000	1.13
@@ -187,7 +187,9 @@
 
     <table width="100%">
       <tr>
-        <th align="left" colspan="3" width="85%"><%= [parameter::get -parameter clubs_pretty_name] %> Name</th>
+        <th align="left" width="55%"><%= [parameter::get -parameter clubs_pretty_name] %> Name</th>
+        <th align="left" width="15%">&nbsp;</th>
+        <th align="left" width="15%">&nbsp;</th>
         <th align="left">Actions</th>
       </tr>
 
@@ -199,7 +201,9 @@
     <else>
       <tr bgcolor="#ffffff">
     </else>
-        <td colspan="3"><a href="@non_member_clubs.url@">@non_member_clubs.pretty_name@</td>
+        <td><a href="@non_member_clubs.url@">@non_member_clubs.pretty_name@</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
 <if @non_member_clubs.join_policy@ eq "open">
         <td>[<small><include src="register-link" url="@non_member_clubs.url@register" referer=@referer@></small>]</td>
 </if>
Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/manage-memberships.tcl	29 Mar 2002 19:14:46 -0000	1.4
+++ openacs-4/packages/dotlrn/www/manage-memberships.tcl	30 May 2002 02:57:35 -0000	1.5
@@ -116,9 +116,15 @@
 }
 
 set n_member_classes [db_string select_n_member_classes {}]
-db_multirow member_classes $member_query {}
-db_multirow member_clubs select_member_clubs {}
 
+db_multirow member_classes $member_query {} {
+    set role [dotlrn_community::get_role_pretty_name -community_id $class_instance_id -rel_type $rel_type]
+}
+
+db_multirow member_clubs select_member_clubs {} {
+    set role [dotlrn_community::get_role_pretty_name -community_id $club_id -rel_type $rel_type]
+}
+
 form create non_member_form
 
 element create non_member_form non_member_department_key \