--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/11/11 20:27:15	1.29
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2003/12/08 19:59:09	1.31
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.29 2003/11/11 20:27:15 albertel Exp $
+# $Id: lonspreadsheet.pm,v 1.31 2003/12/08 19:59:09 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -227,9 +227,12 @@ sub handler {
     }
     my $courseid = $ENV{'request.course.id'};
     #
-    # Do not allow students to continue if standard grading is in effect.
+    # Do not allow students to continue if standard or external grading is in
+    # effect.
+    #
     if ($ENV{'request.role'} =~ /^st\./) {
-        if ($ENV{'course.'.$courseid.'.grading'} eq 'standard') {
+        if ($ENV{'course.'.$courseid.'.grading'} eq 'standard' ||
+	    $ENV{'course.'.$courseid.'.grading'} eq 'external' ) {
             return HTTP_NOT_ACCEPTABLE;
         }
     }
@@ -467,11 +470,9 @@ END
     $r->rflush();
     #
     $r->print("<table><tr>");
-    if ($sheettype eq 'classcalc') {
-        $r->print('<td><input type="submit" value="'.
-		  &mt('Generate Spreadsheet').'" />'.
-                  '</td>');
-    }
+    $r->print('<td><input type="submit" value="'.
+              &mt('Generate Spreadsheet').'" />'.
+              '</td>');
     if ($allowed_to_view) {
         $r->print('<td>'.
                   &Apache::loncommon::help_open_topic("Spreadsheet_About",