Merge branch 'develop'

11ef91a2 · Bruno Martin · 2dabc90d · 236a6eee · 11ef91a2
Commit 11ef91a2 authored May 14, 2020 by Bruno Martin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

courses/models.py courses/models.py +2 -0

No files found.
--- a/courses/models.py
+++ b/courses/models.py
@@ -359,6 +359,8 @@ class CourseStudent(models.Model):
    def get_current_class(self):
        try:
            return Class.objects.get(students=self.user, course=self.course)
+        except Class.MultipleObjectsReturned:
+            return Class.objects.filter(students=self.user, course=self.course).first()
        except Class.DoesNotExist:
            self.course.default_class.students.add(self.user)
            return self.course.default_class