Merge branch 'MDL-60082-master' of git://github.com/damyon/moodle

moodle · Jan 14, 2019 · 0f1377c · 0f1377c
2 parents 4c5b60a + 1879a74
commit 0f1377c
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
@@ -399,10 +399,11 @@ public function __construct(assign $assignment,
         $columns[] = 'grade';
         $headers[] = get_string('grade');
         if ($this->is_downloading()) {
-            if ($this->assignment->get_instance()->grade >= 0) {
+            $gradetype = $this->assignment->get_instance()->grade;
+            if ($gradetype > 0) {
                 $columns[] = 'grademax';
                 $headers[] = get_string('maxgrade', 'assign');
-            } else {
+            } else if ($gradetype < 0) {
                 // This is a custom scale.
                 $columns[] = 'scale';
                 $headers[] = get_string('scale', 'assign');
@@ -413,7 +414,7 @@ public function __construct(assign $assignment,
                 $columns[] = 'workflowstate';
                 $headers[] = get_string('markingworkflowstate', 'assign');
             }
-            // Add a column for the list of valid marking workflow states.
+            // Add a column to show if this grade can be changed.
             $columns[] = 'gradecanbechanged';
             $headers[] = get_string('gradecanbechanged', 'assign');
         }
@@ -907,8 +908,12 @@ public function col_gradecanbechanged(stdClass $row) {
      * @return string
      */
     public function col_grademax(stdClass $row) {
-        $gradeitem = $this->assignment->get_grade_item();
-        return format_float($this->assignment->get_instance()->grade, $gradeitem->get_decimals());
+        if ($this->assignment->get_instance()->grade > 0) {
+            $gradeitem = $this->assignment->get_grade_item();
+            return format_float($this->assignment->get_instance()->grade, $gradeitem->get_decimals());
+        } else {
+            return '';
+        }
     }
 
     /**