Index: openacs-4/packages/dotlrn/www/admin/user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v diff -u -r1.22.4.1 -r1.22.4.2 --- openacs-4/packages/dotlrn/www/admin/user.tcl 22 Apr 2008 22:37:48 -0000 1.22.4.1 +++ openacs-4/packages/dotlrn/www/admin/user.tcl 22 Apr 2008 22:57:36 -0000 1.22.4.2 @@ -85,8 +85,10 @@ set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type] } -set site_wide_admin_p [acs_user::site_wide_admin_p -user_id $user_id] -set dotlrn_admin_p [dotlrn::admin_p -user_id $user_id] +set site_wide_admin_p [acs_user::site_wide_admin_p] +# ER: this is silly, user has to be at least dotlrn admin to get +# to this page and dotlrn admin right is checked above +set dotlrn_admin_p [dotlrn::admin_p] set administrative_action_p [expr {$site_wide_admin_p || $dotlrn_admin_p}] @@ -105,7 +107,7 @@ set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url] -if {$site_wide_admin_p} { +if { [acs_user::site_wide_admin_p -user_id $user_id] } { set toggle_value revoke set toggle_text [_ dotlrn.Revoke_site_wide_admin] } else {