From 7bf00bdc0e9c72646390ce317cf51b488504869c Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 20 Dec 2017 12:46:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D0=B6=D1=83=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D1=8B=20(=D1=82=D0=B5=D0=BC,=20=D1=83=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=D0=BE=D0=B2,=20=D0=BA=D1=83=D1=80=D1=81=D0=BE?= =?UTF-8?q?=D0=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- access/migrations/0006_auto_20171220_1228.py | 20 ++++++++++++++++++++ access/models/other.py | 2 +- csv/load_perm.py | 2 -- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 access/migrations/0006_auto_20171220_1228.py diff --git a/access/migrations/0006_auto_20171220_1228.py b/access/migrations/0006_auto_20171220_1228.py new file mode 100644 index 0000000..103062c --- /dev/null +++ b/access/migrations/0006_auto_20171220_1228.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2017-12-20 12:28 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0005_auto_20171218_1516'), + ] + + operations = [ + migrations.AlterField( + model_name='progress', + name='route', + field=models.CharField(blank=True, max_length=15, null=True, verbose_name='Токен прохождения'), + ), + ] diff --git a/access/models/other.py b/access/models/other.py index 0828983..a86c2f9 100644 --- a/access/models/other.py +++ b/access/models/other.py @@ -47,7 +47,7 @@ class Progress(models.Model): teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь по умолчанию", related_name='teacher_progress') user = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='Студент') - route = models.CharField(max_length=15, verbose_name='Токен прохождения') + route = models.CharField(max_length=15, verbose_name='Токен прохождения', blank=True, null=True) def __str__(self): return '%s' % (self.user.email,) diff --git a/csv/load_perm.py b/csv/load_perm.py index 8ffa6fc..dadbf86 100644 --- a/csv/load_perm.py +++ b/csv/load_perm.py @@ -34,13 +34,11 @@ if __name__ == '__main__': try: p = Progress.objects.get( user=user, - route=route, teacher=get_user_model().objects.get(id=row['teacher']), ) except Progress.DoesNotExist: p = Progress.objects.create( user=user, - route=route, teacher=get_user_model().objects.get(id=row['teacher']), )