From e3e14ebd2172d62681a71632dbf37554d5b24a72 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 4 Sep 2017 12:34:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B2=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81?= =?UTF-8?q?=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- access/models.py | 2 +- journals/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/access/models.py b/access/models.py index e4bfae5..33568bc 100755 --- a/access/models.py +++ b/access/models.py @@ -133,7 +133,7 @@ class User(AbstractBaseUser): deactivate = models.BooleanField(verbose_name=u'Не давать новых студентов', default=False) delay = models.BooleanField(verbose_name=u'Могут быть задержки', default=False, help_text=u'Если возможны задержки с проверками') delay_description = models.TextField(verbose_name=u'Повод просрочки', blank=True) - delay_date = models.DateTimeField(verbose_name=u'Задержка до. Не включая этот день.', blank=True, default=datetime.datetime.now(), null=True) + delay_date = models.DateTimeField(verbose_name=u'Задержка до. Не включая этот день.', blank=True, default=django.utils.timezone.now, null=True) email = models.EmailField(verbose_name='email', max_length=255, blank=True, db_index=True, unique=True, help_text=u'Будьте аккуратны. Менять почту можно. Но только если очень нужно.') changed_email = models.EmailField(verbose_name=u'Ящик на замену', blank=True, null=True) diff --git a/journals/models.py b/journals/models.py index a59b725..6616ccf 100755 --- a/journals/models.py +++ b/journals/models.py @@ -1398,7 +1398,7 @@ class DiplomaJ(models.Model): parent = models.ForeignKey(ExamJ, verbose_name=u'Журнал сдачи', blank=True, null=True) material = models.ForeignKey(Diploma, verbose_name=u'Шаблон диплома') date = models.DateField(verbose_name=u'Дата выдачи', default=datetime.date.today) - key = models.IntegerField(verbose_name=u'Ключ', max_length=255, blank=True, null=True) + key = models.IntegerField(verbose_name=u'Ключ', blank=True, null=True) student = models.ForeignKey(User, verbose_name=u'Студент', null=True) out_image = models.ImageField(verbose_name=u'Картинка без печати', upload_to='diploms', blank=True) in_image = models.ImageField(verbose_name=u'Картинка c печатью', upload_to='diploms', blank=True)