--- loncom/interface/lonparmset.pm 2016/10/25 18:54:48 1.522.2.19 +++ loncom/interface/lonparmset.pm 2017/04/02 13:39:05 1.522.2.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.522.2.19 2016/10/25 18:54:48 raeburn Exp $ +# $Id: lonparmset.pm,v 1.522.2.23 2017/04/02 13:39:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1037,7 +1037,7 @@ sub print_row { } } - &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); + &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly); &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly); &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly); @@ -1051,9 +1051,9 @@ sub print_row { } if ($cgroup) { - &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly)); - &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly)); - &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly)); + &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly); + &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly); + &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly); } if ($uname) { @@ -2026,6 +2026,15 @@ sub assessparms { $csec=$env{'form.csec'}; $cgroup=$env{'form.cgroup'}; + my $noeditgrp; + if ($cgroup ne '') { + unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) { + if (($env{'request.course.groups'} eq '') || + (!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) { + $noeditgrp = 1; + } + } + } if ($udom=$env{'form.udom'}) { } elsif ($udom=$env{'request.role.domain'}) { @@ -3161,6 +3170,7 @@ sub listdata { unless ($readonly) { $r->print(''); + } $r->print(''.&Apache::loncommon::end_data_table_row()); } } @@ -3870,7 +3880,7 @@ ENDMAINFORMHEAD }, { linktext => $linktext{'resettimes'}, url => $url{'resettimes'}, - permission => ($vgr || $mgr) + permission => ($vgr || $mgr), linktitle => $linktitle{'resettimes'}, icon => 'start-here.png', }, @@ -4126,7 +4136,7 @@ sub addmetafield { $r->print(''); $r->print(''); } - $r->print('
Or you may enter a new metadata field name.
print('
Or you may enter a new metadata field name.'); $r->print('
'); $r->print(''); }