Verified Commit 22e277d4 authored by Nicolas Ballet's avatar Nicolas Ballet
Browse files

merged migrations

parent 903f07ec
Pipeline #1442 passed with stage
in 6 minutes and 6 seconds
......@@ -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)),
......
# -*- 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),
),
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment