--- loncom/interface/lonpickstudent.pm	2006/03/16 22:01:44	1.15
+++ loncom/interface/lonpickstudent.pm	2006/06/02 13:58:31	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a student from the classlist
 #
-# $Id: lonpickstudent.pm,v 1.15 2006/03/16 22:01:44 raeburn Exp $
+# $Id: lonpickstudent.pm,v 1.19 2006/06/02 13:58:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,7 @@ use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::longroup;
 
 sub handler {
     my $r = shift;
@@ -76,8 +77,7 @@ sub handler {
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %grouplist=&Apache::lonnet::get_group_membership($cdom,$cnum);
     my $now = time;
-    my %allgroups;
-    &Apache::loncommon::coursegroups(\%allgroups,$cdom,$cnum);
+    my %allgroups = &Apache::longroup::coursegroups($cdom,$cnum);
 
 # --------------------------------------- There is such a user, get environment
 
@@ -106,6 +106,8 @@ ENDSCRIPT
     foreach my $role (sort keys %coursepersonnel) {
        foreach (split(/\,/,$coursepersonnel{$role})) {
 	   my ($puname,$pudom)=split(/\:/,$_);
+           $role = &Apache::lonnet::plaintext($role,
+                                            &Apache::loncommon::course_type());
 	   $r->print('<tr><td>'.
              '<input type="button" value="Select" onClick="gochoose('.
              "'".$puname."','".$pudom."')".'" /></td><td>'.$role.'</td><td>'.