Merge branch 'wip-MDL-58697-master-assigngrading' of git://github.com/adamann2/moodle

diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index 0277e6d..ad5ba63 100644 (file)
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -1042,7 +1042,10 @@ class assign_grading_table extends table_sql implements renderable {
 
         $group = false;
         $submission = false;
-        $this->get_group_and_submission($row->id, $group, $submission, -1);
+
+        if ($instance->teamsubmission) {
+            $this->get_group_and_submission($row->id, $group, $submission, -1);
+        }
 
         if ($instance->teamsubmission && !$group && !$instance->preventsubmissionnotingroup) {
             $group = true;