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

MDL-56948 mod_assign: Don't call get_grade_item() unless we have one

Browse Source
This commit is contained in:
Tony Butler
2016-11-18 15:38:45 +00:00
parent 71d8200285
commit 499fbf48e3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/locallib.php
+3 -4
View File
@@ -1371,7 +1371,6 @@ class assign {
static $scalegrades = array();
$decimals = $this->get_grade_item()->get_decimals();
$o = '';
if ($this->get_instance()->grade >= 0) {
@@ -1380,7 +1379,7 @@ class assign {
if ($grade < 0) {
$displaygrade = '';
} else {
$displaygrade = format_float($grade, $decimals);
$displaygrade = format_float($grade, $this->get_grade_item()->get_decimals());
}
$o .= '<label class="accesshide" for="quickgrade_' . $userid . '">' .
get_string('usergrade', 'assign') .
@@ -1392,7 +1391,7 @@ class assign {
size="6"
maxlength="10"
class="quickgrade"/>';
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade, $decimals);
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade, $this->get_grade_item()->get_decimals());
return $o;
} else {
if ($grade == -1 || $grade === null) {
@@ -1402,7 +1401,7 @@ class assign {
$o .= grade_format_gradevalue($grade, $item);
if ($item->get_displaytype() == GRADE_DISPLAY_TYPE_REAL) {
// If displaying the raw grade, also display the total value.
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade, $decimals);
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade, $item->get_decimals());
}
}
return $o;