From 189c328a30f21d3307b7d9a9e43e418ec690cb5d Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 5 Dec 2016 15:39:28 +0100 Subject: [PATCH] Add order field to Organization, add various migrations (mainly for image fields) --- .../shop/0011_product_content_model.py | 20 +++++++++++++ .../migrations/0020_auto_20161205_1536.py | 20 +++++++++++++ .../job/migrations/0010_auto_20161205_1536.py | 20 +++++++++++++ .../migrations/0018_auto_20161205_1536.py | 20 +++++++++++++ .../migrations/0064_auto_20161205_1536.py | 30 +++++++++++++++++++ app/organization/network/models.py | 1 + .../migrations/0016_auto_20161205_1536.py | 20 +++++++++++++ .../migrations/0031_auto_20161205_1536.py | 20 +++++++++++++ 8 files changed, 151 insertions(+) create mode 100644 app/migrations/shop/0011_product_content_model.py create mode 100644 app/organization/agenda/migrations/0020_auto_20161205_1536.py create mode 100644 app/organization/job/migrations/0010_auto_20161205_1536.py create mode 100644 app/organization/magazine/migrations/0018_auto_20161205_1536.py create mode 100644 app/organization/network/migrations/0064_auto_20161205_1536.py create mode 100644 app/organization/pages/migrations/0016_auto_20161205_1536.py create mode 100644 app/organization/projects/migrations/0031_auto_20161205_1536.py diff --git a/app/migrations/shop/0011_product_content_model.py b/app/migrations/shop/0011_product_content_model.py new file mode 100644 index 00000000..750e6e61 --- /dev/null +++ b/app/migrations/shop/0011_product_content_model.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.11 on 2016-12-05 14:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shop', '0010_remove_product_content_model'), + ] + + operations = [ + migrations.AddField( + model_name='product', + name='content_model', + field=models.CharField(editable=False, max_length=50, null=True), + ), + ] diff --git a/app/organization/agenda/migrations/0020_auto_20161205_1536.py b/app/organization/agenda/migrations/0020_auto_20161205_1536.py new file mode 100644 index 00000000..5b2b116f --- /dev/null +++ b/app/organization/agenda/migrations/0020_auto_20161205_1536.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.11 on 2016-12-05 14:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-agenda', '0019_eventpricedescription'), + ] + + operations = [ + migrations.AlterField( + model_name='eventimage', + name='type', + field=models.CharField(choices=[('logo', 'logo'), ('logo_white', 'logo white'), ('logo_black', 'logo black'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page - slider'), ('page_featured', 'page - featured')], max_length=64, verbose_name='type'), + ), + ] diff --git a/app/organization/job/migrations/0010_auto_20161205_1536.py b/app/organization/job/migrations/0010_auto_20161205_1536.py new file mode 100644 index 00000000..99426609 --- /dev/null +++ b/app/organization/job/migrations/0010_auto_20161205_1536.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.11 on 2016-12-05 14:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-job', '0009_auto_20160930_1940'), + ] + + operations = [ + migrations.AlterField( + model_name='candidacyimage', + name='type', + field=models.CharField(choices=[('logo', 'logo'), ('logo_white', 'logo white'), ('logo_black', 'logo black'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page - slider'), ('page_featured', 'page - featured')], max_length=64, verbose_name='type'), + ), + ] diff --git a/app/organization/magazine/migrations/0018_auto_20161205_1536.py b/app/organization/magazine/migrations/0018_auto_20161205_1536.py new file mode 100644 index 00000000..9136c84a --- /dev/null +++ b/app/organization/magazine/migrations/0018_auto_20161205_1536.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.11 on 2016-12-05 14:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-magazine', '0017_auto_20161104_1026'), + ] + + operations = [ + migrations.AlterField( + model_name='articleimage', + name='type', + field=models.CharField(choices=[('logo', 'logo'), ('logo_white', 'logo white'), ('logo_black', 'logo black'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page - slider'), ('page_featured', 'page - featured')], max_length=64, verbose_name='type'), + ), + ] diff --git a/app/organization/network/migrations/0064_auto_20161205_1536.py b/app/organization/network/migrations/0064_auto_20161205_1536.py new file mode 100644 index 00000000..1d920152 --- /dev/null +++ b/app/organization/network/migrations/0064_auto_20161205_1536.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.11 on 2016-12-05 14:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-network', '0063_auto_20161201_1154'), + ] + + operations = [ + migrations.AddField( + model_name='organization', + name='order', + field=models.IntegerField(default=10, verbose_name='order number'), + ), + migrations.AlterField( + model_name='organizationimage', + name='type', + field=models.CharField(choices=[('logo', 'logo'), ('logo_white', 'logo white'), ('logo_black', 'logo black'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page - slider'), ('page_featured', 'page - featured')], max_length=64, verbose_name='type'), + ), + migrations.AlterField( + model_name='personimage', + name='type', + field=models.CharField(choices=[('logo', 'logo'), ('logo_white', 'logo white'), ('logo_black', 'logo black'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page - slider'), ('page_featured', 'page - featured')], max_length=64, verbose_name='type'), + ), + ] diff --git a/app/organization/network/models.py b/app/organization/network/models.py index 8d5863d4..a0231872 100644 --- a/app/organization/network/models.py +++ b/app/organization/network/models.py @@ -75,6 +75,7 @@ class Organization(Named, Address, URL, AdminThumbRelatedMixin): subway_access = models.TextField(_('subway access'), blank=True) organizations_content = models.ManyToManyField('self', verbose_name=_('Linked organizations (in content)'), related_name='organization_main', blank=True, help_text="Usefull for host organization") organizations_footer = models.ManyToManyField('self', verbose_name=_('Linked organizations (in footer)'), related_name='organization_main', blank=True, help_text="Usefull for host organization") + order = models.IntegerField(_('order number'), default=10) admin_thumb_type = 'logo' diff --git a/app/organization/pages/migrations/0016_auto_20161205_1536.py b/app/organization/pages/migrations/0016_auto_20161205_1536.py new file mode 100644 index 00000000..f3d62327 --- /dev/null +++ b/app/organization/pages/migrations/0016_auto_20161205_1536.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.11 on 2016-12-05 14:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-pages', '0015_auto_20161028_1541'), + ] + + operations = [ + migrations.AlterField( + model_name='pageimage', + name='type', + field=models.CharField(choices=[('logo', 'logo'), ('logo_white', 'logo white'), ('logo_black', 'logo black'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page - slider'), ('page_featured', 'page - featured')], max_length=64, verbose_name='type'), + ), + ] diff --git a/app/organization/projects/migrations/0031_auto_20161205_1536.py b/app/organization/projects/migrations/0031_auto_20161205_1536.py new file mode 100644 index 00000000..a804eb0e --- /dev/null +++ b/app/organization/projects/migrations/0031_auto_20161205_1536.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.11 on 2016-12-05 14:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-projects', '0030_auto_20161107_1828'), + ] + + operations = [ + migrations.AlterField( + model_name='projectimage', + name='type', + field=models.CharField(choices=[('logo', 'logo'), ('logo_white', 'logo white'), ('logo_black', 'logo black'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page - slider'), ('page_featured', 'page - featured')], max_length=64, verbose_name='type'), + ), + ] -- 2.39.5