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.8 -r1.9
--- openacs-4/packages/dotlrn/www/members-chunk-table.tcl 21 May 2002 07:46:03 -0000 1.8
+++ openacs-4/packages/dotlrn/www/members-chunk-table.tcl 24 May 2002 17:44:00 -0000 1.9
@@ -19,7 +19,7 @@
ad_page_contract {
@author arjun (arjun@openforce.net)
@author yon (yon@openforce.net)
- @creation-date Jan 08, 2002
+ @creation-date 2002-01-08
@version $Id$
} -query {
{parent_user_role:multiple,array,optional}
@@ -34,9 +34,9 @@
set community_id [dotlrn_community::get_community_id]
set referer [ns_conn url]
-set site_wide_admin_p [ad_permission_p \
- -user_id $my_user_id \
- [acs_magic_object "security_context_root"] "admin"
+set site_wide_admin_p [permission::permission_p \
+ -object_id [acs_magic_object security_context_root] \
+ -privilege admin \
]
if {!$site_wide_admin_p} {
@@ -48,7 +48,7 @@
}
if {![exists_and_not_null referer]} {
- if {[string equal $admin_p "t"] == 1} {
+ if {[string equal $admin_p t] == 1} {
set referer "one-community-admin"
} else {
set referer "one-community"
@@ -59,71 +59,73 @@
set community_members [dotlrn_community::list_users $community_id]
set table_def [list]
-lappend table_def [list \
- first_names \
- "First Names" \
- {upper(first_names) $order} \
+
+lappend table_def {
+ first_names
+ "First Names"
+ {upper(first_names) $order}
{
[acs_community_member_link -user_id $user_id -label $first_names | ]}
-]
-lappend table_def [list \
- last_name \
- "Last Name" \
- {upper(last_name) $order} \
+}
+
+lappend table_def {
+ last_name
+ "Last Name"
+ {upper(last_name) $order}
{[acs_community_member_link -user_id $user_id -label $last_name | ]}
-]
+}
if {$read_private_data_p || [string equal $my_user_id $user_id]} {
- lappend table_def [list \
- email \
- "Email" \
- {upper(email) $order, upper(role)} \
+ lappend table_def {
+ email
+ Email
+ {upper(email) $order, upper(role)}
{$email | }
- ]
+ }
} else {
- lappend table_def [list \
- email \
- "Email" \
- {upper(email) $order, upper(role)} \
+ lappend table_def {
+ email
+ Email
+ {upper(email) $order, upper(role)}
{ | }
- ]
+ }
}
-lappend table_def [list \
- role \
- "Role" \
- {decode(role, 'instructor', 1, 'admin', 2, 'teaching_assistant', 3, 'course_assistant', 4, 'course_admin', 5, 'student', 6, 'member', 7) asc, last_name $order} \
- "\[dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type \$rel_type\] | "
-]
+lappend table_def {
+ role
+ Role
+ {decode(role,'instructor',1,'admin',2,'teaching_assistant',3,'course_assistant',4,'course_admin',5,'student',6,'member',7) asc, last_name $order} \
+ {[dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type] | }
+}
if {$site_wide_admin_p} {
- lappend table_def [list \
- manage \
- "Actions" \
- {} \
- {\[ Drop Membership | Manage \] | } \
- ]
+ lappend table_def {
+ manage
+ Actions
+ {}
+ {\[ Drop Membership | Manage \] | }
+ }
} elseif {$admin_p} {
- lappend table_def [list \
- manage \
- "Actions" \
- {} \
- {\[ Drop Membership \]} \
- ]
+ lappend table_def {
+ manage
+ Actions
+ {}
+ {\[ Drop Membership \]}
+ }
} else {
- lappend table_def [list \
- manage \
- "Actions" \
- {} \
+ lappend table_def {
+ manage
+ Actions
+ {}
{
[eval {
- if {$my_user_id == $user_id} {
+ if {$my_user_id == \$user_id} {
return "\[ Drop Membership \] | "
} else {
return " | "
}
}]
}
- ]
+ }
}
set sql "
@@ -143,7 +145,7 @@
set table [ad_table \
-Tmissing_text {No members } \
- -Textra_vars {referer my_user_id} \
+ -Textra_vars {referer my_user_id community_id rel_type} \
-Torderby $orderby \
select_current_members \
$sql \
| |