Merge branch 'teacher_hot_fix' into 'dev'

Teacher hot fix

See merge request !466
remotes/origin/comment_fix
Andrey 8 years ago
commit 26fe5fb97b
  1. 4
      courses/tasks.py
  2. 2
      courses/views.py
  3. 2
      finance/views.py

@ -2,12 +2,12 @@ from progress.models import ProgressLesson, Progress
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
def add_lesson(user_out_key: str, course_token: str, lesson_token: str, teacher_key: str, is_hm: bool): def add_lesson(user_out_key: str, course_token: str, lesson_token: str, is_hm: bool):
p = Progress.objects.get(course_token=course_token, user__out_key=user_out_key) p = Progress.objects.get(course_token=course_token, user__out_key=user_out_key)
ProgressLesson.objects.get_or_create( ProgressLesson.objects.get_or_create(
progress=p, progress=p,
lesson_token=lesson_token, lesson_token=lesson_token,
checker=get_user_model().objects.get(out_key=(teacher_key if is_hm else user_out_key)), checker=get_user_model().objects.get(out_key=(p.teacher if is_hm else user_out_key)),
) )

@ -258,6 +258,6 @@ class LessonDetail(APIView):
return Response("Permission denied", status=403) return Response("Permission denied", status=403)
# TODO Задача для селери # TODO Задача для селери
add_lesson(request.user.out_key, course.token, lesson.token, course.get_teacher(), lesson.is_hm) add_lesson(request.user.out_key, course.token, lesson.token, lesson.is_hm)
return Response(l, status=200) return Response(l, status=200)

@ -143,8 +143,6 @@ class InvoiceDetailView(APIView):
key = request.JSON.get('key', None) key = request.JSON.get('key', None)
pay_count = int(request.JSON.get('pay_count', '1')) pay_count = int(request.JSON.get('pay_count', '1'))
print(key)
if bill_id is None: if bill_id is None:
return Response("Не передан id счёта", status=400) return Response("Не передан id счёта", status=400)

Loading…
Cancel
Save