From 054d4cad97a5300a05a500de56396afe1f196a26 Mon Sep 17 00:00:00 2001 From: Lionel Porcheron Date: Wed, 7 Jun 2017 00:15:38 +0200 Subject: [PATCH] Squash CFP migrations for moving into production --- cfp/migrations/0001_initial.py | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/cfp/migrations/0001_initial.py b/cfp/migrations/0001_initial.py index 1988bf2..9d3376d 100644 --- a/cfp/migrations/0001_initial.py +++ b/cfp/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.5 on 2017-05-29 20:47 +# Generated by Django 1.11 on 2017-06-06 22:14 from __future__ import unicode_literals import autoslug.fields @@ -8,6 +8,7 @@ from django.conf import settings import django.core.validators from django.db import migrations, models import django.db.models.deletion +import uuid class Migration(migrations.Migration): @@ -24,9 +25,13 @@ class Migration(migrations.Migration): name='Conference', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(blank=True, max_length=100)), ('home', models.TextField(blank=True, default='')), ('venue', models.TextField(blank=True, default='')), ('city', models.CharField(blank=True, default='', max_length=64)), + ('contact_email', models.CharField(blank=True, max_length=100)), + ('custom_css', models.TextField(blank=True)), + ('external_css_link', models.URLField(blank=True)), ('site', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), ], ), @@ -36,10 +41,18 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), - ('name', models.CharField(max_length=128)), + ('name', models.CharField(max_length=128, verbose_name='Your Name')), ('email', models.EmailField(max_length=254)), - ('phone_number', models.CharField(blank=True, default='', max_length=16, verbose_name='Phone number')), - ('biography', models.TextField(blank=True, verbose_name='Biography')), + ('biography', models.TextField(verbose_name='Biography')), + ('token', models.UUIDField(default=uuid.uuid4, editable=False)), + ('twitter', models.CharField(blank=True, default='', max_length=100, verbose_name='Twitter')), + ('linkedin', models.CharField(blank=True, default='', max_length=100, verbose_name='LinkedIn')), + ('github', models.CharField(blank=True, default='', max_length=100, verbose_name='Github')), + ('website', models.CharField(blank=True, default='', max_length=100, verbose_name='Website')), + ('facebook', models.CharField(blank=True, default='', max_length=100, verbose_name='Facebook')), + ('mastodon', models.CharField(blank=True, default='', max_length=100, verbose_name='Mastodon')), + ('phone_number', models.CharField(blank=True, default='', max_length=64, verbose_name='Phone number')), + ('language', models.CharField(blank=True, max_length=10)), ('notes', models.TextField(blank=True, default='', help_text='This field is only visible by organizers.', verbose_name='Notes')), ('vip', models.BooleanField(default=False)), ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), @@ -51,16 +64,17 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), - ('title', models.CharField(help_text='After submission, title can only be changed by the staff.', max_length=128, verbose_name='Title')), + ('title', models.CharField(max_length=128, verbose_name='Talk Title')), ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='title', unique=True)), - ('description', models.TextField(blank=True, verbose_name='Description')), - ('notes', models.TextField(blank=True, verbose_name='Message to organizers')), + ('description', models.TextField(verbose_name='Description of your talk')), + ('notes', models.TextField(blank=True, help_text='If you have any constraint or if you have anything that may help you to select your talk, like a video or slides of your talk, please write it down here', verbose_name='Message to organizers')), ('videotaped', models.BooleanField(default=True, verbose_name="I'm ok to be recorded on video")), - ('video_licence', models.IntegerField(choices=[(1, 'CC-Zero'), (2, 'CC-BY'), (3, 'CC-BY-SA'), (4, 'CC-BY-ND'), (5, 'CC-BY-NC'), (6, 'CC-BY-NC-SA'), (7, 'CC-BY-NC-ND')], default=2, verbose_name='Video licence')), + ('video_licence', models.CharField(choices=[('CC-Zero CC-BY', 'CC-Zero CC-BY'), ('CC-BY-SA', 'CC-BY-SA'), ('CC-BY-ND', 'CC-BY-ND'), ('CC-BY-NC', 'CC-BY-NC'), ('CC-BY-NC-SA', 'CC-BY-NC-SA'), ('CC-BY-NC-ND', 'CC-BY-NC-ND')], default='CC-BY-SA', max_length=10, verbose_name='Video licence')), ('sound', models.BooleanField(default=False, verbose_name='I need sound')), ('accepted', models.NullBooleanField(default=None)), ('duration', models.PositiveIntegerField(default=0, verbose_name='Duration (min)')), ('plenary', models.BooleanField(default=False)), + ('token', models.UUIDField(default=uuid.uuid4, editable=False)), ], options={ 'ordering': ('category__id', 'title'), @@ -79,6 +93,8 @@ class Migration(migrations.Migration): ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), ], options={ + 'verbose_name': 'category', + 'verbose_name_plural': 'categories', 'ordering': ('pk',), }, ), @@ -108,7 +124,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='talk', name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cfp.TalkCategory', verbose_name='Intervention kind'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cfp.TalkCategory', verbose_name='Talk Category'), ), migrations.AddField( model_name='talk',