From 2fda70c27c88776911e7981e4f0c04ee52f37655 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 19 Dec 2016 14:11:47 +0000 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D0=BB=D0=B5=20out=5Fdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskapp/models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/taskapp/models.py b/taskapp/models.py index 497cef7..85957ed 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -40,7 +40,7 @@ TASK_TYPES = ( class ChangeLog(models.Model): - task = models.ForeignKey(Task) + task = models.ForeignKey('Task') ACT_CHOICES = ( (b'e', u'Изменение задачи'), (b'c', u'Создание задачи'), @@ -56,13 +56,16 @@ class ChangeLog(models.Model): return self.get_act_type_display() +def _delta_add_days(): + return datetime.now() + timedelta(days=3) + class Task(models.Model): descr = models.CharField(max_length=128) recipients = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='them_task') author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='+') #device = models.ForeignKey(Device, related_name='dev') priority = models.CharField(max_length=1, choices=TASK_PRIORITIES, default=TASK_PRIORITIES[2][0]) - out_date = models.DateField(null=True, blank=True, default=datetime.now() + timedelta(days=3)) + out_date = models.DateField(null=True, blank=True, default=_delta_add_days) time_of_create = models.DateTimeField(auto_now_add=True) state = models.CharField(max_length=1, choices=TASK_STATES, default=TASK_STATES[0][0]) attachment = models.ImageField(upload_to='task_attachments/%Y.%m.%d', blank=True, null=True)