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.196 -r1.197
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl 25 Oct 2006 12:53:55 -0000 1.196
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 15 Dec 2006 22:45:22 -0000 1.197
@@ -1234,15 +1234,18 @@
-default 0]
foreach sc_id [get_subcomm_list -community_id $community_id] {
+
+ set url [get_community_url $sc_id]
+ set subgroup_name [get_community_name $sc_id]
+
if {[has_subcommunity_p -community_id $sc_id] \
&& [member_p $sc_id $user_id]} {
# Shows the subcomms of this subcomm ONLY IF I'm a
# member of the current comm
- set url [get_community_url $sc_id]
- append chunk "$pretext [get_community_name $sc_id]\n"
+ append chunk "$pretext $subgroup_name\n"
if {$show_drop_link_p} {
- append chunk "([_ dotlrn.Drop])\n"
+ append chunk "([_ dotlrn.Drop])\n"
}
append chunk "
\n[get_subcomm_chunk -community_id $sc_id -user_id $user_id -only_member_p $only_member_p]
\n"
@@ -1258,8 +1261,6 @@
continue
}
- 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
@@ -1268,25 +1269,25 @@
# illicit registrations if the group is closed.
set parent_url [get_community_url $community_id]
- append chunk "$pretext [get_community_name $sc_id]\n"
+ append chunk "$pretext $subgroup_name\n"
if {![member_p $sc_id $user_id] && [not_closed_p -community_id $sc_id]} {
append chunk ""
if {[member_pending_p -community_id $sc_id -user_id $user_id]} {
append chunk "[_ dotlrn.Pending_Approval]"
} elseif {[needs_approval_p -community_id $sc_id]} {
- append chunk "[_ dotlrn.Request_Membership]\n"
+ append chunk "[_ dotlrn.Request_Membership]\n"
} else {
- append chunk "([_ dotlrn.Join])\n"
+ append chunk "([_ dotlrn.Join])\n"
}
append chunk "\n"
} elseif {[member_p $sc_id $user_id]} {
# User is a member.
if {$show_drop_link_p} {
- append chunk "([_ dotlrn.Drop])\n"
+ append chunk "([_ dotlrn.Drop])\n"
}
}
}