feature/fix_generate_pass
Andrey 8 years ago
parent 902547b76e
commit afd4841768
  1. 2
      access/serializers.py
  2. 1
      access/urls.py
  3. 18
      access/views.py

@ -59,7 +59,7 @@ class UserSelfSerializer(serializers.ModelSerializer):
class Meta:
model = get_user_model()
fields = ('id', 'email', 'first_name', 'last_name', 'progress', 'achievements',
'account', 'groups', 'is_staff', 'is_superuser', 'diplomas')
'account', 'groups', 'is_staff', 'is_superuser', 'diplomas', 'is_active')
@staticmethod
def get_diplomas(self):

@ -7,7 +7,6 @@ urlpatterns = [
url(r'detail/([0-9]{1,99})/$', views.DetailUserView.as_view()),
url(r'guard/(?P<pk>[0-9]{1,99})/(?P<page>.+)/$', views.UserGuardView.as_view()),
url(r'find/$', views.FindUserView.as_view()),
url(r'check/$', views.CheckUserView.as_view()),
url(r'registration/$', views.RegistrationView.as_view()),
url(r'change_password/$', views.ChangePasswordView.as_view()),
url(r'login/$', views.LoginView.as_view()),

@ -24,18 +24,6 @@ class TeacherListView(APIView):
return Response([i.email for i in get_user_model().objects.filter(groups__name='teachers')], self.status_code)
class CheckUserView(APIView):
renderer_classes = (JSONRenderer,)
@staticmethod
def get(request):
if request.user.is_authenticated() and request.user.is_staff or request.user.is_superuser:
return Response('staff', status=200)
if request.user.is_authenticated():
return Response('auth', status=200)
return Response('anonymous', status=200)
class ResetPasswordView(APIView):
renderer_classes = (JSONRenderer,)
@ -197,7 +185,11 @@ class LoginView(APIView):
auth.login(request, user)
except AttributeError:
return Response("Неверный пароль", status=404)
return Response(UserSelfSerializer(request.user).data, status=200)
serialized_user = UserSelfSerializer(user).data
serialized_user['is_i'] = True
return Response(serialized_user, status=200)
class LogoutView(APIView):

Loading…
Cancel
Save