--- loncom/interface/spreadsheet/lonspreadsheet.pm 2003/11/11 20:27:15 1.29 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2004/02/24 21:03:09 1.31.2.1 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.29 2003/11/11 20:27:15 albertel Exp $ +# $Id: lonspreadsheet.pm,v 1.31.2.1 2004/02/24 21:03:09 albertel 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; } } @@ -253,10 +256,12 @@ sub handler { $symb = $ENV{'form.usymb'} if (exists($ENV{'form.usymb'})); my $name = $ENV{'user.name'}; my $domain = $ENV{'user.domain'}; - if (exists($ENV{'form.sname'})) { + if (exists($ENV{'form.sname'}) && $ENV{'form.sname'} ne '') { $name = $ENV{'form.sname'}; $domain = $ENV{'form.sdomain'}; } + $ENV{'form.sname'} = $name; + $ENV{'form.sdomain'} = $domain; ## ## Check permissions my $allowed_to_edit = &Apache::lonnet::allowed('mgr', @@ -467,11 +472,9 @@ END $r->rflush(); # $r->print(""); - if ($sheettype eq 'classcalc') { - $r->print(''); - } + $r->print(''); if ($allowed_to_view) { $r->print('
'. - ''. + ''. &Apache::loncommon::help_open_topic("Spreadsheet_About",