diff --git a/access/new_urls.py b/access/new_urls.py index 0c78478..bf13a00 100644 --- a/access/new_urls.py +++ b/access/new_urls.py @@ -3,4 +3,5 @@ from access import new_view as views urlpatterns = [ url(r'teachers/$', views.TeacherListView.as_view()), + url(r'check/$', views.CheckUserView.as_view()), ] \ No newline at end of file diff --git a/access/new_view.py b/access/new_view.py index 34cf62d..2ae8524 100644 --- a/access/new_view.py +++ b/access/new_view.py @@ -13,4 +13,14 @@ class TeacherListView(APIView): in_role='T', is_active=True, reg_status=4, - )], self.status_code) \ No newline at end of file + )], self.status_code) + + +class CheckUserView(APIView): + renderer_classes = (JSONRenderer,) + status_code = 200 + + def get(self, request): + if request.user.is_authenticated() and (request.user.in_role in ['M', 'S', 'S2', 'A'] or request.user.is_admin): + return Response(True, status=self.status_code) + return Response(False, status=self.status_code) \ No newline at end of file diff --git a/access/serializers.py b/access/serializers.py new file mode 100644 index 0000000..72c81e7 --- /dev/null +++ b/access/serializers.py @@ -0,0 +1,9 @@ +from django.contrib.auth import get_user_model +from rest_framework import serializers + + +class UserInitSerializer(serializers.ModelSerializer): + + class Meta: + model = get_user_model() + fields = '__all__' \ No newline at end of file diff --git a/api/urls.py b/api/urls.py deleted file mode 100644 index e69de29..0000000 diff --git a/courses/migrations/0049_auto_20170907_1753.py b/courses/migrations/0049_auto_20170907_1753.py new file mode 100644 index 0000000..5e51c04 --- /dev/null +++ b/courses/migrations/0049_auto_20170907_1753.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-09-07 17:53 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0048_normalmap'), + ] + + operations = [ + migrations.AddField( + model_name='normalmap', + name='independent_elements', + field=models.TextField(default=''), + ), + migrations.AlterField( + model_name='course', + name='level', + field=models.CharField(choices=[('B', 'Базовый'), ('A', 'Продвинутый'), ('E', 'Экспертный'), ('B+A', 'Базовый + Продвинутый')], default='B', max_length=3, verbose_name='Уровень'), + ), + ]