Merge branch 'current_branch' into 'dev'

migrate update

See merge request !92
feature/fix_generate_pass
Andrey 8 years ago
commit 6502ac527b
  1. 8
      courses/views.py
  2. 2
      progress/views.py

@ -41,6 +41,14 @@ class CourseDetailView(APIView):
renderer_classes = (JSONRenderer,) renderer_classes = (JSONRenderer,)
status_code = 200 status_code = 200
@staticmethod
def delete(request, slug):
try:
Course.objects.get(slug=slug).delete()
except Course.DoesNotExist:
return Response("Курса не существует", status=404)
return Response(status=204)
def get(self, request, slug): def get(self, request, slug):
return Response(CourseDetailSerializer(Course.objects.get(slug=slug)).data, self.status_code) return Response(CourseDetailSerializer(Course.objects.get(slug=slug)).data, self.status_code)

@ -23,7 +23,7 @@ class StudentWorkView(APIView):
@staticmethod @staticmethod
def get(request, teacher_token): def get(request, teacher_token):
client_status = request.GET.get('status', 'in_progress') client_status = request.GET.get('status', 'in_progress')
client_max_body = request.GET.get('max_body', 20) client_max_body = 50
last_id = request.GET.get('last_id', 0) last_id = request.GET.get('last_id', 0)
server_status = Q(status='fail') if \ server_status = Q(status='fail') if \
client_status == 'not_done' else Q(status='wait') if client_status == 'in_progress' else Q(status='done') client_status == 'not_done' else Q(status='wait') if client_status == 'in_progress' else Q(status='done')

Loading…
Cancel
Save