Index: openacs-4/packages/dotlrn/tcl/community-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v diff -u -r1.81.2.1 -r1.81.2.1.4.1 --- openacs-4/packages/dotlrn/tcl/community-procs.xql 16 Feb 2004 14:50:53 -0000 1.81.2.1 +++ openacs-4/packages/dotlrn/tcl/community-procs.xql 13 May 2004 13:59:29 -0000 1.81.2.1.4.1 @@ -138,14 +138,14 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email + from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id - and dotlrn_member_rels_approved.user_id = registered_users.user_id - order by dotlrn_member_rels_approved.rel_type, registered_users.last_name + and dotlrn_member_rels_approved.user_id = acs_users_all.user_id + order by dotlrn_member_rels_approved.rel_type, acs_users_all.last_name @@ -155,16 +155,16 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email + from acs_users_all, dotlrn_member_rels_approved, dotlrn_communities where dotlrn_communities.community_id = :subcomm_id and dotlrn_communities.parent_community_id = dotlrn_member_rels_approved.community_id - and registered_users.user_id = dotlrn_member_rels_approved.user_id - and registered_users.user_id not in (select dm.user_id + and acs_users_all.user_id = dotlrn_member_rels_approved.user_id + and acs_users_all.user_id not in (select dm.user_id from dotlrn_member_rels_full dm where dm.community_id = :subcomm_id) order by last_name @@ -177,13 +177,13 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email + from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id - and dotlrn_member_rels_approved.user_id = registered_users.user_id + and dotlrn_member_rels_approved.user_id = acs_users_all.user_id and dotlrn_member_rels_approved.rel_type = :rel_type Index: openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql,v diff -u -r1.4 -r1.4.6.1 --- openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql 4 Dec 2002 09:51:04 -0000 1.4 +++ openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql 13 May 2004 13:59:29 -0000 1.4.6.1 @@ -9,14 +9,16 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email, + (select count(*) from acs_rels where rel_type = 'user_portrait_rel' and object_id_one = dotlrn_member_rels_approved.user_id) as portrait_p, + (select count(*) from acs_attribute_values where object_id = dotlrn_member_rels_approved.user_id and attribute_id = :bio_attribute_id and attr_value != '') as bio_p + from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id and dotlrn_member_rels_approved.user_id = - registered_users.user_id order by decode(role, + acs_users_all.user_id order by decode(role, 'instructor',1, 'admin',2, 'teaching_assistant',3, Index: openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql,v diff -u -r1.3 -r1.3.6.1 --- openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql 4 Dec 2002 09:51:04 -0000 1.3 +++ openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql 13 May 2004 13:59:29 -0000 1.3.6.1 @@ -9,13 +9,15 @@ dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, dotlrn_member_rels_approved.user_id, - registered_users.first_names, - registered_users.last_name, - registered_users.email - from registered_users, + acs_users_all.first_names, + acs_users_all.last_name, + acs_users_all.email, + (select count(*) from acs_rels where rel_type = 'user_portrait_rel' and object_id_one = dotlrn_member_rels_approved.user_id) as portrait_p, + (select count(*) from acs_attribute_values where object_id = dotlrn_member_rels_approved.user_id and attribute_id = :bio_attribute_id and attr_value != '') as bio_p + from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id - and dotlrn_member_rels_approved.user_id = registered_users.user_id + and dotlrn_member_rels_approved.user_id = acs_users_all.user_id order by ( CASE WHEN role = 'instructor' Index: openacs-4/packages/dotlrn/www/members-chunk-table.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.adp,v diff -u -r1.14.2.1 -r1.14.2.1.4.1 --- openacs-4/packages/dotlrn/www/members-chunk-table.adp 21 Feb 2004 02:36:51 -0000 1.14.2.1 +++ openacs-4/packages/dotlrn/www/members-chunk-table.adp 13 May 2004 13:59:29 -0000 1.14.2.1.4.1 @@ -34,6 +34,7 @@ + @@ -58,6 +59,11 @@ +
   #dotlrn.First_Name# @first_names_order_html;noquote@ + + @acs-subsite.Profile# + + <%=[acs_community_member_link -user_id @current_members.user_id@ -label @current_members.first_names@] %> <%=[acs_community_member_link -user_id @current_members.user_id@ -label @current_members.last_name@]%> Index: openacs-4/packages/dotlrn/www/members-chunk-table.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.tcl,v diff -u -r1.23.2.1 -r1.23.2.1.4.1 --- openacs-4/packages/dotlrn/www/members-chunk-table.tcl 21 Feb 2004 02:36:51 -0000 1.23.2.1 +++ openacs-4/packages/dotlrn/www/members-chunk-table.tcl 13 May 2004 13:59:29 -0000 1.23.2.1.4.1 @@ -98,6 +98,13 @@ } } +set bio_attribute_id [db_string bio_attribute_id { + select attribute_id + from acs_attributes + where object_type = 'person' + and attribute_name = 'bio' +}] + # vars to carry over (from previous script) # Do a special clause for role! @@ -113,7 +120,9 @@ set order_by "$order $order_direction" -db_multirow current_members select_current_members {} +db_multirow -extend { community_member_url } current_members select_current_members {} { + set community_member_url [acs_community_member_url -user_id $user_id] +} db_multirow pending_users select_pending_users { select dotlrn_users.*, Index: openacs-4/packages/dotlrn/www/admin/password-update-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/password-update-2.tcl,v diff -u -r1.2 -r1.2.6.1 --- openacs-4/packages/dotlrn/www/admin/password-update-2.tcl 4 Dec 2002 09:51:04 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/password-update-2.tcl 13 May 2004 13:59:30 -0000 1.2.6.1 @@ -31,7 +31,7 @@ set change_password_url "[ad_url]/user/password-update?[export_vars {user_id {password_old $password_1}}]" set body "[_ dotlrn.lt_Please_follow_the_fol]" -set email [db_string select_user_email {}] +set email [acs_user::get_element -user_id $user_id -element email] # Send email if [catch {ns_sendmail $email $system_owner $subject $body} errmsg] { Fisheye: Tag 1.2.6.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/password-update-2.xql'. Fisheye: No comparison available. Pass `N' to diff?