mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
fixed grades display in assignment/index.php when using different scales; merged from MOODLE_15_STABLE
This commit is contained in:
parent
5055a3e3d3
commit
c86aa2a479
@ -600,7 +600,7 @@ class assignment_base {
|
||||
*/
|
||||
function display_grade($grade) {
|
||||
|
||||
static $scalegrades; // Cached because we only have one per assignment
|
||||
static $scalegrades = array(); // Cache scales for each assignment - they might have different scales!!
|
||||
|
||||
if ($this->assignment->grade >= 0) { // Normal number
|
||||
if ($grade == -1) {
|
||||
@ -610,15 +610,15 @@ class assignment_base {
|
||||
}
|
||||
|
||||
} else { // Scale
|
||||
if (empty($scalegrades)) {
|
||||
if (empty($scalegrades[$this->assignment->id])) {
|
||||
if ($scale = get_record('scale', 'id', -($this->assignment->grade))) {
|
||||
$scalegrades = make_menu_from_list($scale->scale);
|
||||
$scalegrades[$this->assignment->id] = make_menu_from_list($scale->scale);
|
||||
} else {
|
||||
return '-';
|
||||
}
|
||||
}
|
||||
if (isset($scalegrades[$grade])) {
|
||||
return $scalegrades[$grade];
|
||||
if (isset($scalegrades[$this->assignment->id][$grade])) {
|
||||
return $scalegrades[$this->assignment->id][$grade];
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user