From 0cfabab671cb2c29cdfe0212003be8c1a2091603 Mon Sep 17 00:00:00 2001 From: tjhunt Date: Thu, 13 Dec 2007 14:26:14 +0000 Subject: [PATCH] MDL-12517 - Further refinement. Move the processing to after print_header, so any notices do not break XHTML strict. Merged from MOODLE_19_STABLE. --- grade/report/grader/index.php | 14 ++++++-------- lang/en_utf8/grades.php | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php index b4558e8d1a..76b40fb3a5 100644 --- a/grade/report/grader/index.php +++ b/grade/report/grader/index.php @@ -121,11 +121,6 @@ if (!empty($target) && !empty($action) && confirm_sesskey()) { // Initialise the grader report object $report = new grade_report_grader($courseid, $gpr, $context, $page, $sortitemid); -/// processing posted grades & feedback here -if ($data = data_submitted() and confirm_sesskey()) { - $report->process_data($data); -} - // Override perpage if set in URL if ($perpageurl) { $report->user_prefs['studentsperpage'] = $perpageurl; @@ -133,7 +128,6 @@ if ($perpageurl) { $report->load_users(); - $numusers = $report->get_numusers(); $report->load_final_grades(); @@ -149,10 +143,14 @@ $currenttab = 'graderreport'; require('tabs.php'); echo $report->group_selector; - echo '
'; - echo $report->get_toggles_html(); + +/// processing posted grades & feedback here +if ($data = data_submitted() and confirm_sesskey()) { + $report->process_data($data); +} + $studentsperpage = $report->get_pref('studentsperpage'); // Don't use paging if studentsperpage is empty or 0 at course AND site levels if (!empty($studentsperpage)) { diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php index 9e94949cd7..eed337290e 100644 --- a/lang/en_utf8/grades.php +++ b/lang/en_utf8/grades.php @@ -267,7 +267,7 @@ $string['itemsedit'] = 'Edit grade item'; $string['keephigh'] = 'Keep the highest'; $string['keephighhelp'] = 'If set, this option will only keep the X highest grades, X being the selected value for this option.'; $string['keymanager'] = 'Key manager'; -$string['lessthanmin'] = 'grade entered for $a->itemname for $a->username is less than the minimum allowed'; +$string['lessthanmin'] = 'The grade entered for $a->itemname for $a->username is less than the minimum allowed'; $string['lettergrade'] = 'Letter grade'; $string['lettergradenonnumber'] = 'Low and/or High grade were non-numeric for'; $string['letter'] = 'Letter'; @@ -294,7 +294,7 @@ $string['median'] = 'Median'; $string['min'] = 'Lowest'; $string['missingscale'] = 'Scale must be selected'; $string['mode'] = 'Mode'; -$string['morethanmax'] = 'grade entered for $a->itemname for $a->username is more than the maximum allowed'; +$string['morethanmax'] = 'The grade entered for $a->itemname for $a->username is more than the maximum allowed'; $string['movingelement'] = 'Moving $a'; $string['multfactor'] = 'Multiplicator'; $string['multfactorhelp'] = 'Factor by which all grades for this grade item will be multiplied.'; -- 2.39.5