From 2a1bd84f2702b6ad1714a8c2bfcab2b736691bbb Mon Sep 17 00:00:00 2001 From: wad Date: Tue, 9 Jan 2018 16:23:24 +0300 Subject: [PATCH] code review "access" --- access/init_group.py | 1 + access/middleware.py | 1 + access/models/other.py | 9 +++++---- access/serializers.py | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/access/init_group.py b/access/init_group.py index cbf81f0..c191289 100644 --- a/access/init_group.py +++ b/access/init_group.py @@ -4,6 +4,7 @@ sys.path.append("../") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "lms.settings") django.setup() +# TODO переместить в миграции from django.contrib.auth.models import Group diff --git a/access/middleware.py b/access/middleware.py index d749b62..8644bad 100644 --- a/access/middleware.py +++ b/access/middleware.py @@ -32,4 +32,5 @@ class RequestToApi(object): q_data.update({value: data[value]}) request.JSON = q_data if request.method == 'POST' or request.method == 'DELETE': + # TODO или выпилить или в зависимость от settings setattr(request, '_dont_enforce_csrf_checks', True) \ No newline at end of file diff --git a/access/models/other.py b/access/models/other.py index d586dc7..73ab22d 100644 --- a/access/models/other.py +++ b/access/models/other.py @@ -28,7 +28,7 @@ class Account(models.Model): (1, 'male'), (2, 'female'), ) - b_day = models.DateField(blank=True, null=True) + b_day = models.DateField(blank=True, null=True) # TODO birth_day city = models.CharField(max_length=63, null=True, blank=True) gender = models.SmallIntegerField(choices=GENDER_CHOICES, default=0) owner = models.OneToOneField(to=settings.AUTH_USER_MODEL, null=True) @@ -60,14 +60,15 @@ class Progress(models.Model): class PivotProgressVertex(models.Model): + # TODO переименовать в ProgressVertex VERTEX_STATUS = ( (2, 'Выполненно'), (1, 'Ожидание'), (0, 'Не выполненно'), - ) - teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь",) + ) # TODO перейти на Choices из django-model-utils и сделать ключи строками done/wait/fail progress = models.ForeignKey(to=Progress) vertex = models.CharField(max_length=15, blank=True, verbose_name='Ссылки на узлы') status = models.SmallIntegerField(choices=VERTEX_STATUS, default=0) + teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь",) comment = ArrayField(models.CharField(max_length=15, verbose_name='Ссылки на комменты', unique=True), default=[]) - date = models.DateTimeField(verbose_name='Дата зачтения задания', blank=True, null=True) \ No newline at end of file + date = models.DateTimeField(verbose_name='Дата зачтения задания', blank=True, null=True) diff --git a/access/serializers.py b/access/serializers.py index e62c2f6..bcba9c8 100644 --- a/access/serializers.py +++ b/access/serializers.py @@ -6,6 +6,7 @@ from achievements.serialers import DiplomaSerializer, AchievementsSerializer class PivotProgressSerializer(serializers.ModelSerializer): + # TODO переименовать в ProgressVertexSerializer status = serializers.SerializerMethodField() teacher = serializers.SerializerMethodField()