From: Guillaume Pellerin Date: Tue, 23 Aug 2016 22:21:04 +0000 (+0200) Subject: Update initial migrations X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6efecb3dd5a57b90847491328f06970335039f86;p=mezzo.git Update initial migrations --- diff --git a/app/organization/core/migrations/0001_initial.py b/app/organization/core/migrations/0001_initial.py index c8906102..89d68f4a 100644 --- a/app/organization/core/migrations/0001_initial.py +++ b/app/organization/core/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-23 17:45 +# Generated by Django 1.9.7 on 2016-08-23 22:20 from __future__ import unicode_literals from django.db import migrations, models @@ -76,8 +76,8 @@ class Migration(migrations.Migration): ('displayable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='blocks', to='organization-core.CustomDisplayable', verbose_name='displayable')), ], options={ - 'verbose_name': 'block', 'ordering': ('_order',), + 'verbose_name': 'block', 'verbose_name_plural': 'blocks', }, ), @@ -96,8 +96,8 @@ class Migration(migrations.Migration): ('displayable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='images', to='organization-core.CustomDisplayable', verbose_name='displayable')), ], options={ - 'verbose_name': 'image', 'ordering': ('_order',), + 'verbose_name': 'image', 'verbose_name_plural': 'images', }, ), @@ -142,8 +142,8 @@ class Migration(migrations.Migration): ('model', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='blocks', to='organization-core.CustomModel', verbose_name='model')), ], options={ - 'verbose_name': 'block', 'ordering': ('_order',), + 'verbose_name': 'block', 'verbose_name_plural': 'blocks', }, ), @@ -162,8 +162,8 @@ class Migration(migrations.Migration): ('model', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='images', to='organization-core.CustomModel', verbose_name='model')), ], options={ - 'verbose_name': 'image', 'ordering': ('_order',), + 'verbose_name': 'image', 'verbose_name_plural': 'images', }, ), diff --git a/app/organization/festival/migrations/0001_initial.py b/app/organization/festival/migrations/0001_initial.py index 765d9bf2..e3c53faf 100644 --- a/app/organization/festival/migrations/0001_initial.py +++ b/app/organization/festival/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-23 17:45 +# Generated by Django 1.9.7 on 2016-08-23 22:20 from __future__ import unicode_literals from django.db import migrations, models @@ -49,8 +49,8 @@ class Migration(migrations.Migration): ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), ], options={ - 'verbose_name': 'artist', 'ordering': ['last_name'], + 'verbose_name': 'artist', }, bases=(models.Model, mezzanine.utils.models.AdminThumbMixin), ), diff --git a/app/organization/magazine/migrations/0001_initial.py b/app/organization/magazine/migrations/0001_initial.py index ff10e15b..12f45ab6 100644 --- a/app/organization/magazine/migrations/0001_initial.py +++ b/app/organization/magazine/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-23 17:45 +# Generated by Django 1.9.7 on 2016-08-23 22:20 from __future__ import unicode_literals from django.db import migrations, models @@ -12,10 +12,10 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('pages', '0004_auto_20160804_1547'), - ('sites', '0002_alter_domain_unique'), ('contenttypes', '0002_remove_content_type_name'), + ('pages', '0004_auto_20160804_1547'), ('blog', '0001_initial'), + ('sites', '0002_alter_domain_unique'), ] operations = [ @@ -48,8 +48,8 @@ class Migration(migrations.Migration): ('article', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='images', to='organization-magazine.Article', verbose_name='article')), ], options={ - 'verbose_name': 'image', 'ordering': ('_order',), + 'verbose_name': 'image', 'verbose_name_plural': 'images', }, ), @@ -93,8 +93,8 @@ class Migration(migrations.Migration): ('articles', models.ManyToManyField(blank=True, to='organization-magazine.Article', verbose_name='articles')), ], options={ - 'verbose_name': 'topic', 'ordering': ('_order',), + 'verbose_name': 'topic', }, bases=('pages.page', models.Model), ), diff --git a/app/organization/media/migrations/0001_initial.py b/app/organization/media/migrations/0001_initial.py index dbd0158f..a1983324 100644 --- a/app/organization/media/migrations/0001_initial.py +++ b/app/organization/media/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-23 17:45 +# Generated by Django 1.9.7 on 2016-08-23 22:20 from __future__ import unicode_literals from django.db import migrations, models diff --git a/app/organization/network/migrations/0001_initial.py b/app/organization/network/migrations/0001_initial.py index 17443fa2..1ba88112 100644 --- a/app/organization/network/migrations/0001_initial.py +++ b/app/organization/network/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-23 17:45 +# Generated by Django 1.9.7 on 2016-08-23 22:20 from __future__ import unicode_literals from django.db import migrations, models @@ -91,8 +91,8 @@ class Migration(migrations.Migration): ('weaving_css_class', models.CharField(blank=True, choices=[('pattern-bg--circles', 'circles'), ('pattern-bg--squares', 'squares'), ('pattern-bg--stripes', 'stripes'), ('pattern-bg--triangles', 'triangles')], max_length=64, verbose_name='background pattern')), ], options={ - 'verbose_name': 'department page', 'ordering': ('_order',), + 'verbose_name': 'department page', }, bases=('pages.page', models.Model), ), @@ -141,8 +141,8 @@ class Migration(migrations.Migration): ('permanent', models.BooleanField(default=False, verbose_name='permanent')), ], options={ - 'verbose_name': 'person', 'ordering': ['last_name'], + 'verbose_name': 'person', }, bases=('organization-core.customdisplayable', mezzanine.utils.models.AdminThumbMixin), ), @@ -228,8 +228,8 @@ class Migration(migrations.Migration): ('team', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='pages', to='organization-network.Team', verbose_name='team')), ], options={ - 'verbose_name': 'team page', 'ordering': ('_order',), + 'verbose_name': 'team page', }, bases=('pages.page', models.Model), ), diff --git a/app/organization/network/migrations/0002_auto_20160823_1945.py b/app/organization/network/migrations/0002_auto_20160823_1945.py deleted file mode 100644 index c1789652..00000000 --- a/app/organization/network/migrations/0002_auto_20160823_1945.py +++ /dev/null @@ -1,91 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-23 17:45 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('organization-projects', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('organization-network', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='personactivity', - name='project', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-projects.Project', verbose_name='project'), - ), - migrations.AddField( - model_name='personactivity', - name='record_piece', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.RecordPiece'), - ), - migrations.AddField( - model_name='personactivity', - name='second_employer', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='second_employer_activity', to='organization-network.Organization', verbose_name='second employer'), - ), - migrations.AddField( - model_name='personactivity', - name='second_team', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='second_team_activity', to='organization-network.Team', verbose_name='second team'), - ), - migrations.AddField( - model_name='personactivity', - name='status', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.ActivityStatus', verbose_name='status'), - ), - migrations.AddField( - model_name='personactivity', - name='team', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='team_activity', to='organization-network.Team', verbose_name='team'), - ), - migrations.AddField( - model_name='personactivity', - name='training_level', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.TrainingLevel', verbose_name='training level'), - ), - migrations.AddField( - model_name='personactivity', - name='training_speciality', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.TrainingSpectiality', verbose_name='training speciality'), - ), - migrations.AddField( - model_name='personactivity', - name='training_topic', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.TrainingTopic', verbose_name='training topic'), - ), - migrations.AddField( - model_name='personactivity', - name='training_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.TrainingType', verbose_name='training type'), - ), - migrations.AddField( - model_name='person', - name='user', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='user'), - ), - migrations.AddField( - model_name='organization', - name='type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.OrganizationType', verbose_name='organization type'), - ), - migrations.AddField( - model_name='departmentpage', - name='department', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='pages', to='organization-network.Department', verbose_name='department'), - ), - migrations.AddField( - model_name='department', - name='organization', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='departments', to='organization-network.Organization', verbose_name='organization'), - ), - ] diff --git a/app/organization/network/migrations/0002_auto_20160824_0020.py b/app/organization/network/migrations/0002_auto_20160824_0020.py new file mode 100644 index 00000000..96c14575 --- /dev/null +++ b/app/organization/network/migrations/0002_auto_20160824_0020.py @@ -0,0 +1,91 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-23 22:20 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('organization-network', '0001_initial'), + ('organization-projects', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='personactivity', + name='project', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-projects.Project', verbose_name='project'), + ), + migrations.AddField( + model_name='personactivity', + name='record_piece', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.RecordPiece'), + ), + migrations.AddField( + model_name='personactivity', + name='second_employer', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='second_employer_activity', to='organization-network.Organization', verbose_name='second employer'), + ), + migrations.AddField( + model_name='personactivity', + name='second_team', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='second_team_activity', to='organization-network.Team', verbose_name='second team'), + ), + migrations.AddField( + model_name='personactivity', + name='status', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.ActivityStatus', verbose_name='status'), + ), + migrations.AddField( + model_name='personactivity', + name='team', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='team_activity', to='organization-network.Team', verbose_name='team'), + ), + migrations.AddField( + model_name='personactivity', + name='training_level', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.TrainingLevel', verbose_name='training level'), + ), + migrations.AddField( + model_name='personactivity', + name='training_speciality', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.TrainingSpectiality', verbose_name='training speciality'), + ), + migrations.AddField( + model_name='personactivity', + name='training_topic', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.TrainingTopic', verbose_name='training topic'), + ), + migrations.AddField( + model_name='personactivity', + name='training_type', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.TrainingType', verbose_name='training type'), + ), + migrations.AddField( + model_name='person', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='user'), + ), + migrations.AddField( + model_name='organization', + name='type', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-network.OrganizationType', verbose_name='organization type'), + ), + migrations.AddField( + model_name='departmentpage', + name='department', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='pages', to='organization-network.Department', verbose_name='department'), + ), + migrations.AddField( + model_name='department', + name='organization', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='departments', to='organization-network.Organization', verbose_name='organization'), + ), + ] diff --git a/app/organization/pages/migrations/0001_initial.py b/app/organization/pages/migrations/0001_initial.py index 3d764a74..2e349aaf 100644 --- a/app/organization/pages/migrations/0001_initial.py +++ b/app/organization/pages/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-23 17:45 +# Generated by Django 1.9.7 on 2016-08-23 22:20 from __future__ import unicode_literals from django.db import migrations, models @@ -12,9 +12,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), ('pages', '0004_auto_20160804_1547'), ('sites', '0002_alter_domain_unique'), - ('contenttypes', '0002_remove_content_type_name'), ] operations = [ @@ -30,8 +30,8 @@ class Migration(migrations.Migration): ('sub_title_en', models.TextField(blank=True, max_length=1024, null=True, verbose_name='sub title')), ], options={ - 'verbose_name': 'basic page', 'ordering': ('_order',), + 'verbose_name': 'custom page', }, bases=('pages.page', models.Model), ), @@ -44,8 +44,8 @@ class Migration(migrations.Migration): ('content_type', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='content type')), ], options={ - 'verbose_name': 'Dynamic Content Home Body', 'ordering': ('_order',), + 'verbose_name': 'Dynamic Content Home Body', }, ), migrations.CreateModel( @@ -57,8 +57,8 @@ class Migration(migrations.Migration): ('content_type', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='content type')), ], options={ - 'verbose_name': 'Dynamic Content Home Slider', 'ordering': ('_order',), + 'verbose_name': 'Dynamic Content Home Slider', }, ), migrations.CreateModel( @@ -102,8 +102,8 @@ class Migration(migrations.Migration): ('page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='page_blocks', to='pages.Page', verbose_name='page')), ], options={ - 'verbose_name': 'page block', 'ordering': ('_order',), + 'verbose_name': 'page block', 'verbose_name_plural': 'blocks', }, ), @@ -122,8 +122,8 @@ class Migration(migrations.Migration): ('page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='page_images', to='pages.Page', verbose_name='page')), ], options={ - 'verbose_name': 'image', 'ordering': ('_order',), + 'verbose_name': 'image', 'verbose_name_plural': 'images', }, ), diff --git a/app/organization/projects/migrations/0001_initial.py b/app/organization/projects/migrations/0001_initial.py index 0a6d4d66..afa8438b 100644 --- a/app/organization/projects/migrations/0001_initial.py +++ b/app/organization/projects/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-23 17:45 +# Generated by Django 1.9.7 on 2016-08-23 22:20 from __future__ import unicode_literals from django.db import migrations, models @@ -12,8 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('organization-core', '0001_initial'), ('organization-network', '0001_initial'), + ('organization-core', '0001_initial'), ] operations = [