--- loncom/interface/lonpickstudent.pm 2005/02/17 08:29:43 1.8 +++ loncom/interface/lonpickstudent.pm 2006/01/09 20:38:52 1.10 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a student from the classlist # -# $Id: lonpickstudent.pm,v 1.8 2005/02/17 08:29:43 albertel Exp $ +# $Id: lonpickstudent.pm,v 1.10 2006/01/09 20:38:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,17 +57,23 @@ ENDDOCUMENT ($ENV{'QUERY_STRING'},['filter','form','unameelement','udomelement', 'roles']); # Allowed? + my $allowed; + my $scope = $env{'request.course.id'}; + if (!($allowed = &Apache::lonnet::allowed('srm',$scope))) { + $scope .= '/'.$env{'request.course.sec'}; + $allowed = &Apache::lonnet::allowed('srm',$scope); + if ($allowed) { $allowed = 'section'; } + } - unless (($ENV{'form.roles'}) || - (($ENV{'request.course.id'}) && - (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})))) { + unless (($env{'form.roles'}) || + (($env{'request.course.id'}) && ($allowed))) { $r->print('No context.'); return OK; } # See if filter present - my $filter=$ENV{'form.filter'}; + my $filter=$env{'form.filter'}; $filter=~s/\W//g; unless ($filter) { $filter='.'; } @@ -79,8 +85,8 @@ ENDDOCUMENT $r->print(< function gochoose(uname,udom) { - opener.document.$ENV{'form.form'}.$ENV{'form.unameelement'}.value=uname; - var slct=opener.document.$ENV{'form.form'}.$ENV{'form.udomelement'}; + opener.document.$env{'form.form'}.$env{'form.unameelement'}.value=uname; + var slct=opener.document.$env{'form.form'}.$env{'form.udomelement'}; var i; for (i=0;iprint('
'); - if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) && - (!$ENV{'form.roles'})) { + if ($allowed && (!$env{'form.roles'})) { # -------------------------------------------------------- Get course personnel - $r->print('

'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'}. + $r->print('

'.$env{'course.'.$env{'request.course.id'}.'.description'}. '

'); my %coursepersonnel= &Apache::lonnet::get_course_adv_roles(); @@ -120,6 +125,9 @@ ENDSCRIPT # the following undefs are for 'domain', and 'username' respectively. my (undef,undef,$end,$start,$id,$section,$fullname,$status)= @{$classlist->{$_}}; + if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) { + next; + } if ($_=~/^(\w+)\:(\w+)$/) { my ($uname,$udom)=($1,$2); if (($uname=~/^$filter/) || @@ -140,8 +148,8 @@ ENDSCRIPT $r->print('

'); } else { $r->print('

'.&mt('Users with Roles Assigned by').' '. - &Apache::loncommon::plainname($ENV{'user.name'}, - $ENV{'user.domain'}).'

'); + &Apache::loncommon::plainname($env{'user.name'}, + $env{'user.domain'}).''); if ($filter ne '.') { $r->print('
'.&mt('Name starting with').' "'.$filter.'"
'); }