diff --git a/trombi/migrations/0001_initial.py b/trombi/migrations/0001_initial.py index a035c895e1842b6f8766ce5ce91c05caffa088f9..8c1f9a67636387b9ee6c2fc5eb05e57711b1d5b7 100644 --- a/trombi/migrations/0001_initial.py +++ b/trombi/migrations/0001_initial.py @@ -2,54 +2,54 @@ from __future__ import unicode_literals from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone from django.conf import settings +import datetime +import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('club', '0007_auto_20170324_0917'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( name='Trombi', fields=[ - ('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')), - ('subscription_deadline', models.DateField(help_text='Before this date, users are allowed to subscribe to this Trombi. After this date, users subscribed will be allowed to comment on each other.', default=django.utils.timezone.now, verbose_name='subscription deadline')), - ('comments_deadline', models.DateField(help_text="After this date, users won't be able to make comments anymore.", default=django.utils.timezone.now, verbose_name='comments deadline')), - ('max_chars', models.IntegerField(help_text='Maximum number of characters allowed in a comment.', default=400, verbose_name='maximum characters')), + ('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)), + ('subscription_deadline', models.DateField(default=datetime.date.today, help_text='Before this date, users are allowed to subscribe to this Trombi. After this date, users subscribed will be allowed to comment on each other.', verbose_name='subscription deadline')), + ('comments_deadline', models.DateField(default=datetime.date.today, help_text="After this date, users won't be able to make comments anymore.", verbose_name='comments deadline')), + ('max_chars', models.IntegerField(default=400, help_text='Maximum number of characters allowed in a comment.', verbose_name='maximum characters')), ('club', models.OneToOneField(to='club.Club', related_name='trombi')), ], ), migrations.CreateModel( name='TrombiComment', fields=[ - ('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')), + ('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)), ('content', models.TextField(default='', verbose_name='content')), ], ), migrations.CreateModel( name='TrombiUser', fields=[ - ('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')), - ('profile_pict', models.ImageField(verbose_name='profile pict', upload_to='trombi', null=True, help_text='The profile picture you want in the trombi (warning: this picture may be published)', blank=True)), - ('scrub_pict', models.ImageField(verbose_name='scrub pict', upload_to='trombi', null=True, help_text='The scrub picture you want in the trombi (warning: this picture may be published)', blank=True)), - ('trombi', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='trombi', null=True, to='trombi.Trombi', blank=True, related_name='users')), + ('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)), + ('profile_pict', models.ImageField(upload_to='trombi', blank=True, help_text='The profile picture you want in the trombi (warning: this picture may be published)', verbose_name='profile pict', null=True)), + ('scrub_pict', models.ImageField(upload_to='trombi', blank=True, help_text='The scrub picture you want in the trombi (warning: this picture may be published)', verbose_name='scrub pict', null=True)), + ('trombi', models.ForeignKey(to='trombi.Trombi', blank=True, verbose_name='trombi', related_name='users', on_delete=django.db.models.deletion.SET_NULL, null=True)), ('user', models.OneToOneField(verbose_name='trombi user', to=settings.AUTH_USER_MODEL, related_name='trombi_user')), ], ), migrations.AddField( model_name='trombicomment', name='author', - field=models.ForeignKey(verbose_name='author', to='trombi.TrombiUser', related_name='given_comments'), + field=models.ForeignKey(to='trombi.TrombiUser', verbose_name='author', related_name='given_comments'), ), migrations.AddField( model_name='trombicomment', name='target', - field=models.ForeignKey(verbose_name='target', to='trombi.TrombiUser', related_name='received_comments'), + field=models.ForeignKey(to='trombi.TrombiUser', verbose_name='target', related_name='received_comments'), ), ] diff --git a/trombi/models.py b/trombi/models.py index b24bf03bba7e2af359da79c55a06cf84a892ba55..6ed701b2407658f1e4c8e4045716a02329ce51f6 100644 --- a/trombi/models.py +++ b/trombi/models.py @@ -26,7 +26,6 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ from django.core.urlresolvers import reverse from django.conf import settings -from django.utils import timezone from django.core.exceptions import ValidationError from datetime import timedelta, date