Diff for /loncom/homework/grades.pm between versions 1.596.2.10 and 1.596.2.12

version 1.596.2.10, 2011/11/14 23:34:31 version 1.596.2.12, 2011/12/01 00:36:59
Line 7051  sub scantron_get_correction { Line 7051  sub scantron_get_correction {
        .&mt('The ID on the form is [_1]',         .&mt('The ID on the form is [_1]',
             "<tt>$$scan_record{'scantron.ID'}</tt>")              "<tt>$$scan_record{'scantron.ID'}</tt>")
        .'<br />'         .'<br />'
        .&mt('The name on the paper is [_2], [_3]',         .&mt('The name on the paper is [_1], [_2]',
             $$scan_record{'scantron.LastName'},              $$scan_record{'scantron.LastName'},
             $$scan_record{'scantron.FirstName'})              $$scan_record{'scantron.FirstName'})
        .'</p>';         .'</p>';
Line 9573  sub handler { Line 9573  sub handler {
     } else {      } else {
         &init_perm();          &init_perm();
         if (!$env{'request.course.id'}) {          if (!$env{'request.course.id'}) {
             # Not in a course.              unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) &&
             $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";                      ($command =~ /^scantronupload/)) {
             return HTTP_NOT_ACCEPTABLE;                  # Not in a course.
                   $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";
                   return HTTP_NOT_ACCEPTABLE;
               }
         } elsif (!%perm) {          } elsif (!%perm) {
             $request->internal_redirect('/adm/quickgrades');              $request->internal_redirect('/adm/quickgrades');
         }          }

Removed from v.1.596.2.10  
changed lines
  Added in v.1.596.2.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>