L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-39535_master' of https://github.com/markn86/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2013-05-10 10:30:51 +08:00
parent dec909fcdd 63d2081ee7
commit 1248133f7c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/export/lib.php
+1 -1
View File
@@ -434,6 +434,6 @@ class grade_export_update_buffer {
function export_verify_grades($courseid) {
$regraderesult = grade_regrade_final_grades($courseid);
if (is_array($regraderesult)) {
throw new moodle_exception('gradecantregrade', 'error', '', implode(',', $regraderesult));
throw new moodle_exception('gradecantregrade', 'error', '', implode(', ', array_unique($regraderesult)));
}
}
grade/lib.php
+3 -5
View File
@@ -22,7 +22,8 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once $CFG->libdir.'/gradelib.php';
require_once($CFG->libdir . '/gradelib.php');
require_once($CFG->dirroot . '/grade/export/lib.php');
/**
* This class iterates over all users that are graded in a course.
@@ -134,10 +135,7 @@ class graded_users_iterator {
$this->close();
$regraderesult = grade_regrade_final_grades($this->course->id);
if (is_array($regraderesult)) {
throw new moodle_exception('gradecantregrade', 'error', '', implode(',', $regraderesult));
}
export_verify_grades($this->course->id);
$course_item = grade_item::fetch_course_item($this->course->id);
if ($course_item->needsupdate) {
// can not calculate all final grades - sorry