diff --git a/com/migrations/0004_auto_20171023_0929.py b/com/migrations/0004_auto_20171221_1614.py similarity index 95% rename from com/migrations/0004_auto_20171023_0929.py rename to com/migrations/0004_auto_20171221_1614.py index 9bd6f55e..e8d17887 100644 --- a/com/migrations/0004_auto_20171023_0929.py +++ b/com/migrations/0004_auto_20171221_1614.py @@ -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)), diff --git a/com/migrations/0005_poster_display_time.py b/com/migrations/0005_poster_display_time.py deleted file mode 100644 index 2f2eeae3..00000000 --- a/com/migrations/0005_poster_display_time.py +++ /dev/null @@ -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), - ), - ]