Merge branch 'MDL-50724' of git://github.com/andrewhancox/moodle

2015-10-19 17:21:58 +08:00
parent d80d38a936 ce449f6307
commit 7d45554019
4 changed files with 26 additions and 15 deletions
@@ -637,6 +637,13 @@ class assign_grading_table extends table_sql implements renderable {
        $this->get_group_and_submission($row->id, $group, $submission, -1);
        if ($group) {
            return $group->name;
+        } else if ($this->assignment->get_instance()->preventsubmissionnotingroup) {
+            $usergroups = $this->assignment->get_all_groups($row->id);
+            if (count($usergroups) > 1) {
+                return get_string('multipleteamsgrader', 'assign');
+            } else {
+                return get_string('noteamgrader', 'assign');
+            }
        }
        return get_string('defaultteam', 'assign');
    }