Merge branch 'develop' into 'master'

develop into master

See merge request !26

courses_legacy/activities/views.py

@@ -40,7 +40,7 @@ class AnswerViewSet(viewsets.ModelViewSet):
     def perform_create(self, serializer):
         activity = Activity.objects.get(id=self.request.data['activity'])
 
-        if activity.type == 'slidesreveal' and len(activity.answers.all()) > 0:
+        if activity.type == 'slidesreveal' and len(activity.answers.filter(user=self.request.user)) > 0:
             return Response(status=200)
         serializer.save(user=self.request.user)
 

courses_legacy/core/views.py

@@ -662,10 +662,10 @@ class StudentProgressViewSet(viewsets.ModelViewSet):
         # field must be updated, unless it was updated before
         if ('is_complete' in self.request.data.keys() and not
                 student_progress.complete):
-            
+
             has_answer = True
             for act in unit.activities.all():
-                answer_act = act.answers.all()
+                answer_act = act.answers.filter(user=student_progress.user)
                 if len(answer_act) == 0:
                     has_answer = False