--- rat/lonpage.pm 2020/02/17 16:12:35 1.130 +++ rat/lonpage.pm 2020/02/17 23:32:03 1.132 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.130 2020/02/17 16:12:35 raeburn Exp $ +# $Id: lonpage.pm,v 1.132 2020/02/17 23:32:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -898,6 +898,9 @@ sub get_buttons { return; } } + my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '') + ? "/$env{'request.course.sec'}" + : ''); if ($hash->{'encrypted_'.$rid}) { $symb=&Apache::lonenc::encrypted($symb); $esrc=&Apache::lonenc::encrypted($esrc); @@ -927,7 +930,8 @@ sub get_buttons { if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) && ($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { - if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) { + if ((&Apache::lonnet::allowed('mgr',$crs_sec)) || + (&Apache::lonnet::allowed('vgr',$crs_sec))) { $metainfo.= ''. @@ -935,7 +939,10 @@ sub get_buttons { ''.&mt('View Submissions for a Student or a Group of Students').''. - ''. + ''; + } + if (&Apache::lonnet::allowed('mgr',$crs_sec)) { + $metainfo.= ''. '&command=gradingmenu">'. @@ -944,7 +951,8 @@ sub get_buttons { ' title="'.&mt('Content Grades').'" />'. ''; } - if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { + if ((&Apache::lonnet::allowed('opa',$crs_sec)) || + (&Apache::lonnet::allowed('vpa',$crs_sec))) { $metainfo.= ''. @@ -985,14 +993,14 @@ sub get_buttons { if ((&Apache::lonnet::allowed('cre','/')) && (&Apache::lonnet::metadata($url,'sourceavail') eq 'open')) { $viewsrcbutton = 1; - } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) { + } elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) { if ($url =~ m{^\Q/res/$cdom/\E($LONCAPA::match_username)/}) { my $auname = $1; if (($env{'request.course.adhocsrcaccess'} ne '') && (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) { $viewsrcbutton = 1; } elsif ((&Apache::lonnet::metadata($url,'sourceavail') eq 'open') && - (&Apache::lonnet::allowed('bre','/'))) { + (&Apache::lonnet::allowed('bre',$crs_sec))) { $viewsrcbutton = 1; } }