Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.165 -r1.166
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl 15 Aug 2002 20:23:35 -0000 1.165
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 15 Aug 2002 20:39:35 -0000 1.166
@@ -1171,6 +1171,14 @@
set url [get_community_url $sc_id]
+ # We will use the parent_url in our register link because before the user has
+ # registered they can't read the subgroup, and they can't read the subgroup because
+ # they haven't joined it yet. The semantics enforced by using the parent group's
+ # url seem right to me: the request processor will kick out any attempt to register
+ # if the user can't read the parent group, while register itself will protect against
+ # illicit registrations if the group is closed.
+ set parent_url [get_community_url $community_id]
+
append chunk "$pretext [get_community_name $sc_id]\n"
if {![member_p $sc_id $user_id] && [not_closed_p -community_id $sc_id]} {
@@ -1180,9 +1188,10 @@
if {[member_pending_p -community_id $sc_id -user_id $user_id]} {
append chunk "Pending Approval"
} elseif {[needs_approval_p -community_id $sc_id]} {
- append chunk "Request Membership"
+ append chunk ">Request Membership\n"
+
} else {
- append chunk "Join"
+ append chunk "\n"
}
append chunk " \]\n"