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

[raeburn]

raeburn		Tue Nov 29 17:00:19 2011 EDT

  Modified files:              
    /loncom/homework	grades.pm 
  Log:
  - Bubblesheet operator role can be selected again.
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.663 loncom/homework/grades.pm:1.664
--- loncom/homework/grades.pm:1.663	Mon Nov 14 03:08:01 2011
+++ loncom/homework/grades.pm	Tue Nov 29 17:00:19 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.663 2011/11/14 03:08:01 raeburn Exp $
+# $Id: grades.pm,v 1.664 2011/11/29 17:00:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9388,23 +9388,25 @@
     }
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
+# see what command we need to execute
+
+    my @commands=&Apache::loncommon::get_env_multiple('form.command');
+    my $command=$commands[0];
+
     &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');
     }
     &Apache::loncommon::content_type($request,'text/html');
     $request->send_http_header;
 
-
-# see what command we need to execute
-
-    my @commands=&Apache::loncommon::get_env_multiple('form.command');
-    my $command=$commands[0];
-
     if ($#commands > 0) {
 	&Apache::lonnet::logthis("grades got multiple commands ".join(':', at commands));
     }