From 21f77397a29d9b57e4433a4c401cb8d63152ebc2 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Tue, 2 Oct 2012 12:39:23 +0800 Subject: [PATCH] MDL-35728: Fix download all submissions for a team assignment when there are no groups --- mod/assign/locallib.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index 6ac4d933dd4..f596c22d12d 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -1805,16 +1805,20 @@ class assign { if ($this->get_instance()->teamsubmission) { $submission = $this->get_group_submission($userid, 0, false); $submissiongroup = $this->get_submission_group($userid); - $groupname = '-' . $submissiongroup->name; + if ($submissiongroup) { + $groupname = $submissiongroup->name . '-'; + } else { + $groupname = get_string('defaultteam', 'assign') . '-'; + } } else { $submission = $this->get_user_submission($userid, false); } if ($this->is_blind_marking()) { - $prefix = clean_filename(str_replace('_', ' ', get_string('participant', 'assign') . $groupname) . + $prefix = clean_filename(str_replace('_', ' ', $groupname . get_string('participant', 'assign')) . "_" . $this->get_uniqueid_for_user($userid) . "_"); } else { - $prefix = clean_filename(str_replace('_', ' ', fullname($student) . $groupname) . + $prefix = clean_filename(str_replace('_', ' ', $groupname . fullname($student)) . "_" . $this->get_uniqueid_for_user($userid) . "_"); }