[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /homework grades.pm

[raeburn]

raeburn		Tue Nov 29 17:17:36 2011 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/homework	grades.pm 
  Log:
   Backport 1.664.
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.596.2.10 loncom/homework/grades.pm:1.596.2.11
--- loncom/homework/grades.pm:1.596.2.10	Mon Nov 14 23:34:31 2011
+++ loncom/homework/grades.pm	Tue Nov 29 17:17:35 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.10 2011/11/14 23:34:31 raeburn Exp $
+# $Id: grades.pm,v 1.596.2.11 2011/11/29 17:17:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9573,9 +9573,12 @@
     } 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');
         }