merged migrations

This commit is contained in:
gnikwo 2017-12-21 16:15:11 +01:00
parent 903f07ecbd
commit 22e277d4f7
No known key found for this signature in database
GPG Key ID: 7498D7DF2F867695
2 changed files with 1 additions and 19 deletions

View File

@ -23,6 +23,7 @@ class Migration(migrations.Migration):
('file', models.ImageField(verbose_name='file', upload_to='com/posters')),
('date_begin', models.DateTimeField(default=django.utils.timezone.now)),
('date_end', models.DateTimeField(blank=True, null=True)),
('display_time', models.IntegerField(verbose_name='display time', default=30)),
('is_moderated', models.BooleanField(verbose_name='is moderated', default=False)),
('club', models.ForeignKey(verbose_name='club', related_name='posters', to='club.Club')),
('moderator', models.ForeignKey(verbose_name='moderator', blank=True, null=True, related_name='moderated_posters', to=settings.AUTH_USER_MODEL)),

View File

@ -1,19 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('com', '0004_auto_20171023_0929'),
]
operations = [
migrations.AddField(
model_name='poster',
name='display_time',
field=models.IntegerField(verbose_name='display time', default=30),
),
]