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.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql	31 Jan 2002 17:03:17 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql	1 Feb 2002 21:37:15 -0000	1.3
@@ -28,12 +28,12 @@
 
     <fullquery name="select_non_dotlrn_users">
       <querytext>
-        select persons.person_id,
+        select persons.person_id as user_id,
                persons.first_names,
                persons.last_name,
                parties.email,
-               't',
-               'f',
+               't' as limited_access_p,
+               'f' as read_private_data_p,
                acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p
         from persons,
              parties
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp	30 Jan 2002 23:32:41 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp	1 Feb 2002 21:37:15 -0000	1.3
@@ -1,3 +1,3 @@
 <formtemplate id="user_search"></formtemplate>
 
-<include src="users-chunk" &users="users">
+<include src="users-chunk" type=@type@ &users="users">
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.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql	31 Jan 2002 17:03:17 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql	1 Feb 2002 21:37:15 -0000	1.3
@@ -48,12 +48,12 @@
 
     <fullquery name="select_non_dotlrn_users">
       <querytext>
-        select persons.person_id,
+        select persons.person_id as user_id,
                persons.first_names,
                persons.last_name,
                parties.email,
-               't',
-               'f',
+               't' as limited_access_p,
+               'f' as read_private_data_p,
                acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p
         from persons,
              parties
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp	30 Jan 2002 23:32:41 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp	1 Feb 2002 21:37:15 -0000	1.3
@@ -1,3 +1,3 @@
 <p>@control_bar@</p>
 
-<include src="users-chunk" &users="users">
+<include src="users-chunk" type=@type@ &users="users">
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.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql	31 Jan 2002 17:03:17 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql	1 Feb 2002 21:37:15 -0000	1.3
@@ -23,12 +23,12 @@
 
     <fullquery name="select_non_dotlrn_users">
       <querytext>
-        select persons.person_id,
+        select persons.person_id as user_id,
                persons.first_names,
                persons.last_name,
                parties.email,
-               't',
-               'f',
+               't' as limited_access_p,
+               'f' as read_private_data_p,
                acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p
         from persons,
              parties
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp	30 Jan 2002 23:32:41 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp	1 Feb 2002 21:37:15 -0000	1.3
@@ -1 +1 @@
-<include src="users-chunk" &users="users">
+<include src="users-chunk" type=@type@ &users="users">
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.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-chunk.adp	30 Jan 2002 23:32:41 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp	1 Feb 2002 21:37:15 -0000	1.3
@@ -19,7 +19,14 @@
 %>
 
         <tr bgcolor="@bgcolor@">
-          <td><a href="user-edit?user_id=@users.user_id@">@users.last_name@, @users.first_names@</a> (<a href="mailto:@users.email@">@users.email@</a>)</td>
+          <td>
+            <if @type@ eq "pending">
+              <a href="user-new-2?user_id=@users.user_id@">@users.last_name@, @users.first_names@</a> (<a href="mailto:@users.email@">@users.email@</a>)
+            </if>
+            <else>
+              <a href="user-edit?user_id=@users.user_id@">@users.last_name@, @users.first_names@</a> (<a href="mailto:@users.email@">@users.email@</a>)
+            </else>
+          </td>
           <td align="center"><if @users.limited_access_p@ eq t>limited</if><else>full</else></td>
           <td align="center"><if @users.read_private_data_p@ eq t>yes</if><else>no</else></td>
           <td align="center">