Merge branch 'current_branch' into 'dev'

last_active

See merge request !145
feature/fix_accout_not_found
Andrey 8 years ago
commit 3edad835e7
  1. 3
      access/views.py
  2. 2
      progress/views.py

@ -293,7 +293,8 @@ class MinUserView(APIView):
class ManagementPassword(generics.GenericAPIView): class ManagementPassword(generics.GenericAPIView):
permission_classes = (permissions.IsAuthenticated, permissions.IsAdminUser) permission_classes = (permissions.IsAuthenticated, permissions.IsAdminUser)
def post(self, request): @staticmethod
def post(request):
""" """
Set password to the student in admin area by manager Set password to the student in admin area by manager
--- ---

@ -5,6 +5,7 @@ from django.contrib.auth import get_user_model
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.mail import EmailMessage from django.core.mail import EmailMessage
from django.http import HttpResponse, HttpResponseForbidden from django.http import HttpResponse, HttpResponseForbidden
from rest_framework import permissions
from rest_framework.permissions import IsAuthenticated from rest_framework.permissions import IsAuthenticated
from rest_framework.renderers import JSONRenderer from rest_framework.renderers import JSONRenderer
from rest_framework.response import Response from rest_framework.response import Response
@ -168,6 +169,7 @@ class TeacherUpdateProgress(APIView):
class StudentUpdateProgress(APIView): class StudentUpdateProgress(APIView):
permission_classes = (permissions.IsAuthenticated,)
renderer_classes = (JSONRenderer,) renderer_classes = (JSONRenderer,)
@staticmethod @staticmethod

Loading…
Cancel
Save