From e04740339673dc79c52865606f1e8eebf2da71d7 Mon Sep 17 00:00:00 2001 From: Tommaso Armstrong Date: Tue, 25 Oct 2016 10:33:09 +1100 Subject: [PATCH] Fixed bug where LearningRecord datetime would always be overridden with the current time --- clatoolkit_project/clatoolkit/migrations/0001_initial.py | 3 ++- clatoolkit_project/clatoolkit/models.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/clatoolkit_project/clatoolkit/migrations/0001_initial.py b/clatoolkit_project/clatoolkit/migrations/0001_initial.py index e2aa03a..861d212 100644 --- a/clatoolkit_project/clatoolkit/migrations/0001_initial.py +++ b/clatoolkit_project/clatoolkit/migrations/0001_initial.py @@ -3,6 +3,7 @@ from django.db import models, migrations import django_pgjson.fields +import django.utils.timezone from django.conf import settings @@ -79,7 +80,7 @@ class Migration(migrations.Migration): ('platformparentid', models.CharField(max_length=5000, blank=True)), ('parent_user_external', models.CharField(max_length=5000, null=True, blank=True)), ('message', models.TextField(blank=True)), - ('datetimestamp', models.DateTimeField(auto_now_add=True, null=True)), + ('datetimestamp', models.DateTimeField(default=django.utils.timezone.now)), ('senttolrs', models.CharField(max_length=5000, blank=True)), ('parent_user', models.ForeignKey(related_name='parent_user', to=settings.AUTH_USER_MODEL, null=True)), ], diff --git a/clatoolkit_project/clatoolkit/models.py b/clatoolkit_project/clatoolkit/models.py index 65d0c18..1182d7e 100644 --- a/clatoolkit_project/clatoolkit/models.py +++ b/clatoolkit_project/clatoolkit/models.py @@ -2,6 +2,7 @@ from django.contrib.auth.models import User from django_pgjson.fields import JsonField from django.core.exceptions import ObjectDoesNotExist +from django.utils import timezone import os class UserProfile(models.Model): @@ -225,7 +226,7 @@ class LearningRecord(models.Model): parent_user = models.ForeignKey(User, null=True, related_name="parent_user") parent_user_external = models.CharField(max_length=5000, blank=True, null=True) message = models.TextField(blank=True) - datetimestamp = models.DateTimeField(auto_now_add=True, null=True) + datetimestamp = models.DateTimeField(default=timezone.now) senttolrs = models.CharField(max_length=5000, blank=True)