Merge branch 'current_branch' into 'dev'

pay

See merge request !251
master
Andrey 8 years ago
commit 53441959d8
  1. 6
      courses/serializers.py
  2. 2
      courses/views.py

@ -1,4 +1,3 @@
from django.contrib.auth import get_user_model
from rest_framework import serializers
from courses.models import Course, Lesson, Topic
@ -83,16 +82,11 @@ class CourseDetailSerializer(serializers.ModelSerializer):
level = serializers.SerializerMethodField()
direction = serializers.SerializerMethodField()
statistic = serializers.SerializerMethodField()
teacher_emails = serializers.SerializerMethodField()
class Meta:
model = Course
exclude = ('id', )
@staticmethod
def get_teacher_emails(self):
return [i.email for i in get_user_model().objects.filter(out_key__in=self.teacher_tokens)]
@staticmethod
def get_level(self):
return self.get_level_display()

@ -89,7 +89,7 @@ class LessonInfoView(APIView):
lesson = Lesson.objects.get(token=token)
except Lesson.DoesNotExist:
return Response('Урок не найден', status=404)
if request.user.is_authenticated and request.user.out_key in lesson.topic.course.teacher_tokens:
if request.user.is_authenticated:
return Response(TeacherLessonSerializer(lesson).data, self.status_code)
return Response("Пользователь не является преподователем по курсу", status=403)

Loading…
Cancel
Save