Index: openacs-4/packages/dotlrn/www/admin/user-edit-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit-oracle.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/user-edit-oracle.xql 8 Feb 2002 20:50:57 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/user-edit-oracle.xql 9 Feb 2002 15:31:58 -0000 1.3 @@ -10,12 +10,12 @@ dotlrn_users.last_name, dotlrn_users.email, dotlrn_users.type, - case when dotlrn_full_user_rels.rel_id is null then 'limited' else 'full' end as access_level, + case when dotlrn_full_user_profile_rels.rel_id is null then 'limited' else 'full' end as access_level, acs_permission.permission_p(:dotlrn_package_id, :user_id, 'read_private_data') as read_private_data_p from dotlrn_users, - dotlrn_full_user_rels + dotlrn_full_user_profile_rels where dotlrn_users.user_id = :user_id - and dotlrn_users.rel_id = dotlrn_full_user_rels.rel_id(+) + and dotlrn_users.rel_id = dotlrn_full_user_profile_rels.rel_id(+) Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 1 Feb 2002 21:37:15 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 9 Feb 2002 15:31:58 -0000 1.4 @@ -9,10 +9,10 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - nvl((select 'f' - from dotlrn_full_user_rels - where dotlrn_full_user_rels.rel_id = dotlrn_users.rel_id), - 't') as limited_access_p, + nvl((select 'full' + from dotlrn_full_user_profile_rels + where dotlrn_full_user_profile_rels.rel_id = dotlrn_users.rel_id), + 'limited') as access_level, acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users @@ -32,7 +32,7 @@ persons.first_names, persons.last_name, parties.email, - 't' as limited_access_p, + 'limited' as access_level, 'f' as read_private_data_p, acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p from persons, Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 1 Feb 2002 21:37:15 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 9 Feb 2002 15:31:58 -0000 1.4 @@ -33,10 +33,10 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - nvl((select 'f' - from dotlrn_full_user_rels - where dotlrn_full_user_rels.rel_id = dotlrn_users.rel_id), - 't') as limited_access_p, + nvl((select 'full' + from dotlrn_full_user_profile_rels + where dotlrn_full_user_profile_rels.rel_id = dotlrn_users.rel_id), + 'limited') as access_level, acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users @@ -52,7 +52,7 @@ persons.first_names, persons.last_name, parties.email, - 't' as limited_access_p, + 'limited' as access_level, 'f' as read_private_data_p, acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p from persons, Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 1 Feb 2002 21:37:15 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 9 Feb 2002 15:31:58 -0000 1.4 @@ -9,10 +9,10 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - nvl((select 'f' - from dotlrn_full_user_rels - where dotlrn_full_user_rels.rel_id = dotlrn_users.rel_id), - 't') as limited_access_p, + nvl((select 'full' + from dotlrn_full_user_profile_rels + where dotlrn_full_user_profile_rels.rel_id = dotlrn_users.rel_id), + 'limited') as access_level, acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users @@ -27,7 +27,7 @@ persons.first_names, persons.last_name, parties.email, - 't' as limited_access_p, + 'limited' as access_level, 'f' as read_private_data_p, acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p from persons, Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/users-chunk.adp 1 Feb 2002 21:46:22 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp 9 Feb 2002 15:31:58 -0000 1.5 @@ -27,7 +27,7 @@ @users.last_name@, @users.first_names@ (@users.email@) - limitedfull + @users.access_level@ yesno