Merge branch 'current_branch' into 'dev'

migrate update See merge request !45
8 years ago · b739c774e5
parent 07e70b0822 936e097706
commit b739c774e5
1 changed files with 2 additions and 3 deletions
--- a/progress/views.py
+++ b/progress/views.py
@ -165,10 +165,9 @@ class StudentUpdateProgress(APIView):
                )

                if not pv.status == ProgressLesson.STATUSES.wait:
-                    if pv.checker == p.teacher:
+                    if pv.checker == p.teacher and not comment is None:
                        pv.status = ProgressLesson.STATUSES.wait
-                        if not comment is None:
-                            pv.comment_tokens.append(comment)
+                        pv.comment_tokens.append(comment)

                    elif pv.checker == p.user:
                        pv.status = ProgressLesson.STATUSES.done