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.183.2.3.4.1 -r1.183.2.3.4.2 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 13 May 2004 15:08:26 -0000 1.183.2.3.4.1 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 20 May 2004 08:30:26 -0000 1.183.2.3.4.2 @@ -665,13 +665,6 @@ } { Returns list of admin users } { - set bio_attribute_id [db_string bio_attribute_id { - select attribute_id - from acs_attributes - where object_type = 'person' - and attribute_name = 'bio' - }] - return [list_users -rel_type dotlrn_admin_rel $community_id] } @@ -681,8 +674,6 @@ } { Returns the list of users with a membership_id, a user_id, first name, last name, email, and role. - - AKS: uncaching this until we figure out how to cache ns_sets correctly } { return [dotlrn_community::list_users_not_cached \ -rel_type $rel_type \ @@ -696,6 +687,13 @@ } { Memoizing helper } { + set bio_attribute_id [db_string bio_attribute_id { + select attribute_id + from acs_attributes + where object_type = 'person' + and attribute_name = 'bio' + }] + return [db_list_of_ns_sets select_users {}] } @@ -1195,7 +1193,7 @@ set url [get_community_url $sc_id] append chunk "$pretext [get_community_name $sc_id]\n" - append chunk "[_ dotlrn.Drop]\n" + append chunk "([_ dotlrn.Drop])\n" append chunk "\n" } elseif {[member_p $sc_id $user_id] || [not_closed_p -community_id $sc_id]} { @@ -1230,14 +1228,14 @@ } elseif {[needs_approval_p -community_id $sc_id]} { 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. - append chunk "[_ dotlrn.Drop]\n" + append chunk "([_ dotlrn.Drop])\n" } }