reinit migrations

diff --git a/app/festival/migrations/0001_initial.py b/app/festival/migrations/0001_initial.py
index 3967870c987f27f494241cd000c2b9f76c7156ae..12a95a7605dc5bda5820f35b6755ea0301eb65c1 100644 (file)
--- a/app/festival/migrations/0001_initial.py
+++ b/app/festival/migrations/0001_initial.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+import mezzanine.utils.models
 import django.db.models.deletion
 import mezzanine.core.fields
 
@@ -18,32 +19,77 @@ class Migration(migrations.Migration):
             name='Artist',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=255, verbose_name='name')),
+                ('keywords_string', models.CharField(max_length=500, editable=False, blank=True)),
+                ('title', models.CharField(max_length=500, verbose_name='Title')),
+                ('title_fr', models.CharField(max_length=500, null=True, verbose_name='Title')),
+                ('title_en', models.CharField(max_length=500, null=True, verbose_name='Title')),
+                ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)),
+                ('_meta_title', models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True)),
+                ('description', models.TextField(verbose_name='Description', blank=True)),
+                ('description_fr', models.TextField(null=True, verbose_name='Description', blank=True)),
+                ('description_en', models.TextField(null=True, verbose_name='Description', blank=True)),
+                ('gen_description', models.BooleanField(default=True, help_text='If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description.', verbose_name='Generate description')),
+                ('created', models.DateTimeField(null=True, editable=False)),
+                ('updated', models.DateTimeField(null=True, editable=False)),
+                ('status', models.IntegerField(default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status', choices=[(1, 'Draft'), (2, 'Published')])),
+                ('publish_date', models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True)),
+                ('expiry_date', models.DateTimeField(help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on', blank=True)),
+                ('short_url', models.URLField(null=True, blank=True)),
+                ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
+                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
+                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('bio', mezzanine.core.fields.RichTextField(verbose_name='biography', blank=True)),
+                ('bio_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='biography', blank=True)),
+                ('bio_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='biography', blank=True)),
                 ('photo', mezzanine.core.fields.FileField(max_length=1024, verbose_name='photo', blank=True)),
                 ('photo_credits', models.CharField(max_length=255, null=True, verbose_name='photo credits', blank=True)),
-                ('bio', mezzanine.core.fields.RichTextField(null=True, verbose_name='bio', blank=True)),
-                ('bio_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='bio', blank=True)),
-                ('bio_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='bio', blank=True)),
+                ('featured', models.BooleanField(default=False, verbose_name='featured')),
+                ('site', models.ForeignKey(editable=False, to='sites.Site')),
             ],
             options={
                 'db_table': 'festival_artists',
                 'verbose_name': 'artist',
             },
+            bases=(models.Model, mezzanine.utils.models.AdminThumbMixin),
         ),
         migrations.CreateModel(
-            name='MetaEvent',
+            name='EventCategory',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=512, verbose_name='name')),
+                ('description', models.TextField(verbose_name='description', blank=True)),
+            ],
+            options={
+                'verbose_name': 'event category',
+            },
+        ),
+        migrations.CreateModel(
+            name='FestivalEvent',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('eve_event_id', models.IntegerField(verbose_name='eve id', blank=True)),
-                ('featured', models.BooleanField(verbose_name='featured')),
+                ('featured', models.BooleanField(default=False, verbose_name='featured')),
                 ('featured_image', mezzanine.core.fields.FileField(max_length=1024, verbose_name='featured image', blank=True)),
                 ('featured_image_header', mezzanine.core.fields.FileField(max_length=1024, verbose_name='featured image header', blank=True)),
                 ('artists', models.ManyToManyField(related_name='metaevents', verbose_name='artists', to='festival.Artist', blank=True)),
-                ('event', models.ForeignKey(related_name='meta_events', on_delete=django.db.models.deletion.SET_NULL, verbose_name='meta event', blank=True, to='mezzanine_agenda.Event', null=True)),
+                ('category', models.ForeignKey(related_name='festival_events', on_delete=django.db.models.deletion.SET_NULL, verbose_name='category', blank=True, to='festival.EventCategory', null=True)),
+                ('event', models.ForeignKey(related_name='festival_events', on_delete=django.db.models.deletion.SET_NULL, verbose_name='festival event', blank=True, to='mezzanine_agenda.Event', null=True)),
+            ],
+            options={
+                'db_table': 'festival_events',
+                'verbose_name': 'festival event',
+            },
+        ),
+        migrations.CreateModel(
+            name='PageCategory',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=512, verbose_name='name')),
+                ('description', models.TextField(verbose_name='description', blank=True)),
             ],
             options={
-                'db_table': 'festival_meta_events',
-                'verbose_name': 'meta event',
+                'verbose_name': 'page category',
             },
         ),
         migrations.CreateModel(
@@ -52,9 +98,13 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('keywords_string', models.CharField(max_length=500, editable=False, blank=True)),
                 ('title', models.CharField(max_length=500, verbose_name='Title')),
+                ('title_fr', models.CharField(max_length=500, null=True, verbose_name='Title')),
+                ('title_en', models.CharField(max_length=500, null=True, verbose_name='Title')),
                 ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)),
                 ('_meta_title', models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True)),
                 ('description', models.TextField(verbose_name='Description', blank=True)),
+                ('description_fr', models.TextField(null=True, verbose_name='Description', blank=True)),
+                ('description_en', models.TextField(null=True, verbose_name='Description', blank=True)),
                 ('gen_description', models.BooleanField(default=True, help_text='If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description.', verbose_name='Generate description')),
                 ('created', models.DateTimeField(null=True, editable=False)),
                 ('updated', models.DateTimeField(null=True, editable=False)),
@@ -63,8 +113,11 @@ class Migration(migrations.Migration):
                 ('expiry_date', models.DateTimeField(help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on', blank=True)),
                 ('short_url', models.URLField(null=True, blank=True)),
                 ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
+                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
+                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
                 ('media_id', models.IntegerField(verbose_name='media id')),
-                ('event', models.ForeignKey(related_name='videos', on_delete=django.db.models.deletion.SET_NULL, verbose_name='meta event', blank=True, to='mezzanine_agenda.Event', null=True)),
+                ('event', models.ForeignKey(related_name='videos', on_delete=django.db.models.deletion.SET_NULL, verbose_name='event', blank=True, to='mezzanine_agenda.Event', null=True)),
                 ('site', models.ForeignKey(editable=False, to='sites.Site')),
             ],
             options={

diff --git a/app/festival/migrations/0002_auto_20160224_1243.py b/app/festival/migrations/0002_auto_20160224_1243.py
deleted file mode 100644 (file)
index 92090c6..0000000
--- a/app/festival/migrations/0002_auto_20160224_1243.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('festival', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='artist',
-            name='bio',
-        ),
-        migrations.RemoveField(
-            model_name='artist',
-            name='bio_en',
-        ),
-        migrations.RemoveField(
-            model_name='artist',
-            name='bio_fr',
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='content',
-            field=mezzanine.core.fields.RichTextField(default='', verbose_name='Content'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AlterField(
-            model_name='video',
-            name='event',
-            field=models.ForeignKey(related_name='videos', on_delete=django.db.models.deletion.SET_NULL, verbose_name='event', blank=True, to='mezzanine_agenda.Event', null=True),
-        ),
-    ]

diff --git a/app/festival/migrations/0003_auto_20160224_1835.py b/app/festival/migrations/0003_auto_20160224_1835.py
deleted file mode 100644 (file)
index ca49b2d..0000000
--- a/app/festival/migrations/0003_auto_20160224_1835.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('festival', '0002_auto_20160224_1243'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EventCategory',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=512, verbose_name='name')),
-                ('description', models.TextField(verbose_name='description', blank=True)),
-            ],
-            options={
-                'verbose_name': 'event category',
-            },
-        ),
-        migrations.CreateModel(
-            name='PageCategory',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=512, verbose_name='name')),
-                ('description', models.TextField(verbose_name='description', blank=True)),
-            ],
-            options={
-                'verbose_name': 'page category',
-            },
-        ),
-        migrations.RemoveField(
-            model_name='artist',
-            name='content',
-        ),
-        migrations.RemoveField(
-            model_name='artist',
-            name='content_en',
-        ),
-        migrations.RemoveField(
-            model_name='artist',
-            name='content_fr',
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='bio',
-            field=mezzanine.core.fields.RichTextField(verbose_name='biography', blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='bio_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='biography', blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='bio_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='biography', blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='description',
-            field=models.TextField(verbose_name='description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='description_en',
-            field=models.TextField(null=True, verbose_name='description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='description_fr',
-            field=models.TextField(null=True, verbose_name='description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='featured',
-            field=models.BooleanField(default=False, verbose_name='featured'),
-        ),
-        migrations.AlterField(
-            model_name='artist',
-            name='name',
-            field=models.CharField(max_length=512, verbose_name='name'),
-        ),
-        migrations.AlterField(
-            model_name='metaevent',
-            name='featured',
-            field=models.BooleanField(default=False, verbose_name='featured'),
-        ),
-        migrations.AddField(
-            model_name='metaevent',
-            name='category',
-            field=models.ForeignKey(related_name='meta_events', on_delete=django.db.models.deletion.SET_NULL, verbose_name='category', blank=True, to='festival.EventCategory', null=True),
-        ),
-    ]

diff --git a/app/festival/migrations/0004_auto_20160225_0352.py b/app/festival/migrations/0004_auto_20160225_0352.py
deleted file mode 100644 (file)
index 566c4cd..0000000
--- a/app/festival/migrations/0004_auto_20160225_0352.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0002_auto_20160224_1142'),
-        ('festival', '0003_auto_20160224_1835'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='FestivalEvent',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('eve_event_id', models.IntegerField(verbose_name='eve id', blank=True)),
-                ('featured', models.BooleanField(default=False, verbose_name='featured')),
-                ('featured_image', mezzanine.core.fields.FileField(max_length=1024, verbose_name='featured image', blank=True)),
-                ('featured_image_header', mezzanine.core.fields.FileField(max_length=1024, verbose_name='featured image header', blank=True)),
-                ('artists', models.ManyToManyField(related_name='metaevents', verbose_name='artists', to='festival.Artist', blank=True)),
-                ('category', models.ForeignKey(related_name='festival_events', on_delete=django.db.models.deletion.SET_NULL, verbose_name='category', blank=True, to='festival.EventCategory', null=True)),
-                ('event', models.ForeignKey(related_name='festival_events', on_delete=django.db.models.deletion.SET_NULL, verbose_name='festival event', blank=True, to='mezzanine_agenda.Event', null=True)),
-            ],
-            options={
-                'db_table': 'festival_events',
-                'verbose_name': 'festival event',
-            },
-        ),
-        migrations.RemoveField(
-            model_name='metaevent',
-            name='artists',
-        ),
-        migrations.RemoveField(
-            model_name='metaevent',
-            name='category',
-        ),
-        migrations.RemoveField(
-            model_name='metaevent',
-            name='event',
-        ),
-        migrations.DeleteModel(
-            name='MetaEvent',
-        ),
-    ]

diff --git a/app/festival/migrations/0005_auto_20160225_0500.py b/app/festival/migrations/0005_auto_20160225_0500.py
deleted file mode 100644 (file)
index 67f2050..0000000
--- a/app/festival/migrations/0005_auto_20160225_0500.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sites', '0001_initial'),
-        ('festival', '0004_auto_20160225_0352'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='artist',
-            name='name',
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='_meta_title',
-            field=models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='content',
-            field=mezzanine.core.fields.RichTextField(default='', verbose_name='Content'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='created',
-            field=models.DateTimeField(null=True, editable=False),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='expiry_date',
-            field=models.DateTimeField(help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on', blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='gen_description',
-            field=models.BooleanField(default=True, help_text='If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description.', verbose_name='Generate description'),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='in_sitemap',
-            field=models.BooleanField(default=True, verbose_name='Show in sitemap'),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='keywords_string',
-            field=models.CharField(max_length=500, editable=False, blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='publish_date',
-            field=models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='short_url',
-            field=models.URLField(null=True, blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='site',
-            field=models.ForeignKey(default=None, editable=False, to='sites.Site'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='slug',
-            field=models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='status',
-            field=models.IntegerField(default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status', choices=[(1, 'Draft'), (2, 'Published')]),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='title',
-            field=models.CharField(default='', max_length=500, verbose_name='Title'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='updated',
-            field=models.DateTimeField(null=True, editable=False),
-        ),
-        migrations.AlterField(
-            model_name='artist',
-            name='description',
-            field=models.TextField(verbose_name='Description', blank=True),
-        ),
-        migrations.AlterField(
-            model_name='artist',
-            name='description_en',
-            field=models.TextField(null=True, verbose_name='Description', blank=True),
-        ),
-        migrations.AlterField(
-            model_name='artist',
-            name='description_fr',
-            field=models.TextField(null=True, verbose_name='Description', blank=True),
-        ),
-    ]

diff --git a/app/festival/migrations/0006_auto_20160225_0503.py b/app/festival/migrations/0006_auto_20160225_0503.py
deleted file mode 100644 (file)
index 03e6316..0000000
--- a/app/festival/migrations/0006_auto_20160225_0503.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('festival', '0005_auto_20160225_0500'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='artist',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='title_en',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='artist',
-            name='title_fr',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-    ]

diff --git a/app/festival/migrations/0007_auto_20160225_1214.py b/app/festival/migrations/0007_auto_20160225_1214.py
deleted file mode 100644 (file)
index 0b03017..0000000
--- a/app/festival/migrations/0007_auto_20160225_1214.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('festival', '0006_auto_20160225_0503'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='video',
-            name='content',
-            field=mezzanine.core.fields.RichTextField(default='', verbose_name='Content'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='video',
-            name='description_en',
-            field=models.TextField(null=True, verbose_name='Description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='video',
-            name='description_fr',
-            field=models.TextField(null=True, verbose_name='Description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='video',
-            name='title_en',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='video',
-            name='title_fr',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-    ]

diff --git a/app/festival/migrations/0008_auto_20160225_1218.py b/app/festival/migrations/0008_auto_20160225_1218.py
deleted file mode 100644 (file)
index 5e514a1..0000000
--- a/app/festival/migrations/0008_auto_20160225_1218.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('festival', '0007_auto_20160225_1214'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='video',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='video',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-    ]