Merge branch 'statistics_migrate' into 'dev'

Statistics migrate

See merge request !458
remotes/origin/autodeploy
Andrey 8 years ago
commit fdc4683ca2
  1. 2
      access/views.py
  2. 2
      progress/views.py

@ -314,7 +314,7 @@ class ManagementPassword(generics.GenericAPIView):
password = ''.join(random.choice(string.ascii_letters) for _x in range(8)) password = ''.join(random.choice(string.ascii_letters) for _x in range(8))
try: try:
user = get_user_model().objects.get(email=email) user = get_user_model().objects.get(email=email.lower())
except get_user_model().DoesNotExist: except get_user_model().DoesNotExist:
return Response('user not found', status=404) return Response('user not found', status=404)

@ -360,7 +360,7 @@ class ChangeTeacherView(APIView):
except get_user_model().DoesNotExist: except get_user_model().DoesNotExist:
return Response("Нет пользователя c таким email", status=404) return Response("Нет пользователя c таким email", status=404)
p.teacher = teacher p.teacher = teacher
p.progresslesson_set.filter(status=ProgressLesson.STATUSES.wait).update(checker=teacher) p.progresslesson_set.exclude(status=ProgressLesson.STATUSES.done).update(checker=teacher)
p.save() p.save()
except Progress.DoesNotExist: except Progress.DoesNotExist:
return Response("не найден прогресс по заданному id", status=404) return Response("не найден прогресс по заданному id", status=404)

Loading…
Cancel
Save