--- loncom/homework/grades.pm 2011/10/23 02:15:25 1.596.2.9
+++ loncom/homework/grades.pm 2011/12/01 00:36:59 1.596.2.12
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.596.2.9 2011/10/23 02:15:25 raeburn Exp $
+# $Id: grades.pm,v 1.596.2.12 2011/12/01 00:36:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -7051,7 +7051,7 @@ sub scantron_get_correction {
.&mt('The ID on the form is [_1]',
"$$scan_record{'scantron.ID'}")
.'
'
- .&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.FirstName'})
.'
';
@@ -9382,9 +9382,10 @@ sub assign_clicker_grades {
# FIXME: This should probably look for the first handgradeable part
my $part=$$partlist[0];
# Start screen output
- my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}).'
';
+ my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
- $result .= &Apache::loncommon::start_data_table().
+ $result .= '
'.
+ &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
''.&mt('Assigning grades based on clicker file').' | '.
&Apache::loncommon::end_data_table_header_row().
@@ -9572,9 +9573,12 @@ sub handler {
} else {
&init_perm();
if (!$env{'request.course.id'}) {
- # Not in a course.
- $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";
- return HTTP_NOT_ACCEPTABLE;
+ unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) &&
+ ($command =~ /^scantronupload/)) {
+ # 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) {
$request->internal_redirect('/adm/quickgrades');
}