]> git.parisson.com Git - mezzo.git/commitdiff
Reinit all organization migrations avoiding concrete class inheritance
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 1 Sep 2016 15:50:15 +0000 (17:50 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 1 Sep 2016 15:50:15 +0000 (17:50 +0200)
44 files changed:
app/organization/agenda/migrations/0001_initial.py
app/organization/core/migrations/0001_initial.py
app/organization/core/migrations/0002_auto_20160824_1454.py [deleted file]
app/organization/core/migrations/0003_auto_20160825_1232.py [deleted file]
app/organization/core/migrations/0004_auto_20160901_1555.py [deleted file]
app/organization/core/migrations/0005_auto_20160901_1555.py [deleted file]
app/organization/core/translation.py
app/organization/festival/migrations/0001_initial.py
app/organization/magazine/migrations/0001_initial.py
app/organization/magazine/migrations/0002_auto_20160824_1454.py [deleted file]
app/organization/magazine/migrations/0002_auto_20160901_1737.py [new file with mode: 0644]
app/organization/magazine/migrations/0003_auto_20160825_1232.py [deleted file]
app/organization/magazine/migrations/0004_auto_20160825_1259.py [deleted file]
app/organization/magazine/migrations/0005_auto_20160825_1308.py [deleted file]
app/organization/magazine/migrations/0006_auto_20160825_1543.py [deleted file]
app/organization/magazine/migrations/0007_auto_20160825_1614.py [deleted file]
app/organization/magazine/migrations/0008_auto_20160825_1835.py [deleted file]
app/organization/magazine/migrations/0009_auto_20160825_1838.py [deleted file]
app/organization/magazine/migrations/0010_auto_20160825_1843.py [deleted file]
app/organization/magazine/migrations/0011_auto_20160826_1708.py [deleted file]
app/organization/media/admin.py
app/organization/media/migrations/0001_initial.py
app/organization/media/migrations/0002_auto_20160826_1805.py [deleted file]
app/organization/media/migrations/0003_auto_20160826_1806.py [deleted file]
app/organization/media/migrations/0004_auto_20160826_1834.py [deleted file]
app/organization/media/migrations/0005_displayableaudio.py [deleted file]
app/organization/media/migrations/0006_auto_20160901_1555.py [deleted file]
app/organization/media/models.py
app/organization/media/translation.py
app/organization/network/admin.py
app/organization/network/migrations/0001_initial.py
app/organization/network/migrations/0002_auto_20160824_0020.py [deleted file]
app/organization/network/migrations/0002_auto_20160901_1737.py [new file with mode: 0644]
app/organization/network/migrations/0003_auto_20160901_1555.py [deleted file]
app/organization/pages/admin.py
app/organization/pages/migrations/0001_initial.py
app/organization/pages/migrations/0002_auto_20160824_1454.py [deleted file]
app/organization/pages/migrations/0003_auto_20160824_1550.py [deleted file]
app/organization/pages/migrations/0004_auto_20160825_1232.py [deleted file]
app/organization/pages/models.py
app/organization/pages/translation.py
app/organization/projects/migrations/0001_initial.py
app/organization/projects/migrations/0002_auto_20160901_1555.py [deleted file]
app/settings.py

index 49c2eaf5dfadc5dcd50d27be95a1ac59f5ec70f3..0fb3c0436ac7b0c3f1d30d8cc27d18a1305d8804 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 14:27
+# Generated by Django 1.9.7 on 2016-09-01 15:24
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -29,9 +29,9 @@ class Migration(migrations.Migration):
                 ('event', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='blocks', to='mezzanine_agenda.Event', verbose_name='event')),
             ],
             options={
-                'verbose_name': 'block',
-                'verbose_name_plural': 'blocks',
                 'ordering': ('_order',),
+                'verbose_name_plural': 'blocks',
+                'verbose_name': 'block',
             },
         ),
         migrations.CreateModel(
@@ -47,9 +47,9 @@ class Migration(migrations.Migration):
                 ('event', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='images', to='mezzanine_agenda.Event', verbose_name='event')),
             ],
             options={
-                'verbose_name': 'image',
-                'verbose_name_plural': 'images',
                 'ordering': ('_order',),
+                'verbose_name_plural': 'images',
+                'verbose_name': 'image',
             },
         ),
     ]
index 89d68f4ab3e3da7a6c36c0ba0bdfab074329f8d8..f65a4d6acd6b72657ed4867283293022a5b99696 100644 (file)
@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-23 22:20
+# Generated by Django 1.9.7 on 2016-09-01 15:26
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import django.db.models.deletion
-import mezzanine.core.fields
 
 
 class Migration(migrations.Migration):
@@ -12,7 +10,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('sites', '0002_alter_domain_unique'),
     ]
 
     operations = [
@@ -27,92 +24,6 @@ class Migration(migrations.Migration):
                 'verbose_name': 'category',
             },
         ),
-        migrations.CreateModel(
-            name='CustomDisplayable',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
-                ('title', models.CharField(max_length=500, verbose_name='Title')),
-                ('slug', models.CharField(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
-                ('_meta_title', models.CharField(blank=True, 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')),
-                ('description', models.TextField(blank=True, verbose_name='Description')),
-                ('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(editable=False, null=True)),
-                ('updated', models.DateTimeField(editable=False, null=True)),
-                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
-                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
-                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
-                ('short_url', models.URLField(blank=True, null=True)),
-                ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
-                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
-            ],
-            options={
-                'verbose_name': 'custom displayable',
-            },
-        ),
-        migrations.CreateModel(
-            name='CustomModel',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-            ],
-            options={
-                'verbose_name': 'custom model',
-            },
-        ),
-        migrations.CreateModel(
-            name='DisplayableBlock',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('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')),
-                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
-                ('title', models.CharField(max_length=1024, verbose_name='title')),
-                ('title_fr', models.CharField(max_length=1024, null=True, verbose_name='title')),
-                ('title_en', models.CharField(max_length=1024, null=True, verbose_name='title')),
-                ('description', models.TextField(blank=True, verbose_name='description')),
-                ('with_separator', models.BooleanField(default=False)),
-                ('background_color', models.CharField(blank=True, choices=[('black', 'black'), ('yellow', 'yellow'), ('red', 'red')], max_length=32, verbose_name='background color')),
-                ('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={
-                'ordering': ('_order',),
-                'verbose_name': 'block',
-                'verbose_name_plural': 'blocks',
-            },
-        ),
-        migrations.CreateModel(
-            name='DisplayableImage',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
-                ('title', models.CharField(max_length=1024, verbose_name='title')),
-                ('description', models.TextField(blank=True, verbose_name='description')),
-                ('description_fr', models.TextField(blank=True, null=True, verbose_name='description')),
-                ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
-                ('file', mezzanine.core.fields.FileField(max_length=1024, verbose_name='Image')),
-                ('credits', models.CharField(blank=True, max_length=256, null=True, verbose_name='credits')),
-                ('type', models.CharField(blank=True, choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type')),
-                ('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={
-                'ordering': ('_order',),
-                'verbose_name': 'image',
-                'verbose_name_plural': 'images',
-            },
-        ),
-        migrations.CreateModel(
-            name='DisplayableLink',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('url', models.URLField(blank=True, max_length=512, verbose_name='URL')),
-                ('displayable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='organization-core.CustomDisplayable', verbose_name='displayable')),
-            ],
-            options={
-                'verbose_name': 'link',
-                'verbose_name_plural': 'links',
-            },
-        ),
         migrations.CreateModel(
             name='LinkType',
             fields=[
@@ -125,72 +36,4 @@ class Migration(migrations.Migration):
                 'ordering': ['ordering'],
             },
         ),
-        migrations.CreateModel(
-            name='ModelBlock',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('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')),
-                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
-                ('title', models.CharField(max_length=1024, verbose_name='title')),
-                ('title_fr', models.CharField(max_length=1024, null=True, verbose_name='title')),
-                ('title_en', models.CharField(max_length=1024, null=True, verbose_name='title')),
-                ('description', models.TextField(blank=True, verbose_name='description')),
-                ('with_separator', models.BooleanField(default=False)),
-                ('background_color', models.CharField(blank=True, choices=[('black', 'black'), ('yellow', 'yellow'), ('red', 'red')], max_length=32, verbose_name='background color')),
-                ('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={
-                'ordering': ('_order',),
-                'verbose_name': 'block',
-                'verbose_name_plural': 'blocks',
-            },
-        ),
-        migrations.CreateModel(
-            name='ModelImage',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
-                ('title', models.CharField(max_length=1024, verbose_name='title')),
-                ('description', models.TextField(blank=True, verbose_name='description')),
-                ('description_fr', models.TextField(blank=True, null=True, verbose_name='description')),
-                ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
-                ('file', mezzanine.core.fields.FileField(max_length=1024, verbose_name='Image')),
-                ('credits', models.CharField(blank=True, max_length=256, null=True, verbose_name='credits')),
-                ('type', models.CharField(blank=True, choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type')),
-                ('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={
-                'ordering': ('_order',),
-                'verbose_name': 'image',
-                'verbose_name_plural': 'images',
-            },
-        ),
-        migrations.CreateModel(
-            name='ModelLink',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('url', models.URLField(blank=True, max_length=512, verbose_name='URL')),
-                ('link_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization-core.LinkType', verbose_name='link type')),
-                ('model', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='organization-core.CustomModel', verbose_name='model')),
-            ],
-            options={
-                'verbose_name': 'link',
-                'verbose_name_plural': 'links',
-            },
-        ),
-        migrations.AddField(
-            model_name='displayablelink',
-            name='link_type',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization-core.LinkType', verbose_name='link type'),
-        ),
-        migrations.AlterOrderWithRespectTo(
-            name='modellink',
-            order_with_respect_to='model',
-        ),
-        migrations.AlterOrderWithRespectTo(
-            name='displayablelink',
-            order_with_respect_to='displayable',
-        ),
     ]
diff --git a/app/organization/core/migrations/0002_auto_20160824_1454.py b/app/organization/core/migrations/0002_auto_20160824_1454.py
deleted file mode 100644 (file)
index 84c0cd0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-24 12:54
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-core', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='displayableimage',
-            name='type',
-            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type'),
-        ),
-        migrations.AlterField(
-            model_name='modelimage',
-            name='type',
-            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type'),
-        ),
-    ]
diff --git a/app/organization/core/migrations/0003_auto_20160825_1232.py b/app/organization/core/migrations/0003_auto_20160825_1232.py
deleted file mode 100644 (file)
index 26fe0ee..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 10:32
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-core', '0002_auto_20160824_1454'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='displayableimage',
-            name='type',
-            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page slider')], max_length=64, verbose_name='type'),
-        ),
-        migrations.AlterField(
-            model_name='modelimage',
-            name='type',
-            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page slider')], max_length=64, verbose_name='type'),
-        ),
-    ]
diff --git a/app/organization/core/migrations/0004_auto_20160901_1555.py b/app/organization/core/migrations/0004_auto_20160901_1555.py
deleted file mode 100644 (file)
index b7aff37..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-01 13:55
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-core', '0003_auto_20160825_1232'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='customdisplayable',
-            name='site',
-        ),
-        migrations.RemoveField(
-            model_name='displayableblock',
-            name='displayable',
-        ),
-        migrations.RemoveField(
-            model_name='displayableimage',
-            name='displayable',
-        ),
-        migrations.RemoveField(
-            model_name='displayablelink',
-            name='displayable',
-        ),
-        migrations.RemoveField(
-            model_name='displayablelink',
-            name='link_type',
-        ),
-        migrations.RemoveField(
-            model_name='modelblock',
-            name='model',
-        ),
-        migrations.RemoveField(
-            model_name='modelimage',
-            name='model',
-        ),
-        migrations.RemoveField(
-            model_name='modellink',
-            name='link_type',
-        ),
-        migrations.RemoveField(
-            model_name='modellink',
-            name='model',
-        ),
-    ]
diff --git a/app/organization/core/migrations/0005_auto_20160901_1555.py b/app/organization/core/migrations/0005_auto_20160901_1555.py
deleted file mode 100644 (file)
index da475b7..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-01 13:55
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-network', '0003_auto_20160901_1555'),
-        ('organization-core', '0004_auto_20160901_1555'),
-        ('organization-projects', '0002_auto_20160901_1555'),
-        ('organization-media', '0006_auto_20160901_1555'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='CustomDisplayable',
-        ),
-        migrations.DeleteModel(
-            name='CustomModel',
-        ),
-        migrations.DeleteModel(
-            name='DisplayableBlock',
-        ),
-        migrations.DeleteModel(
-            name='DisplayableImage',
-        ),
-        migrations.DeleteModel(
-            name='DisplayableLink',
-        ),
-        migrations.DeleteModel(
-            name='ModelBlock',
-        ),
-        migrations.DeleteModel(
-            name='ModelImage',
-        ),
-        migrations.DeleteModel(
-            name='ModelLink',
-        ),
-    ]
index 083386a13fb01a2b92551a32450670681a23cf94..b18e24da71b469fcf8439e66d3ee4daeb17f118b 100644 (file)
@@ -3,50 +3,4 @@ from mezzanine.pages.models import Page, RichText
 from mezzanine.pages.translation import TranslatedRichText
 from organization.core.models import *
 
-
-# @register(CustomDisplayable)
-# class CustomDisplayableTranslationOptions(TranslationOptions):
-#
-#     pass
-#
-#
-# @register(DisplayableImage)
-# class DisplayableImageTranslationOptions(TranslationOptions):
-#
-#     fields = ('description',)
-#
-#
-# @register(DisplayableLink)
-# class DisplayableLinkTranslationOptions(TranslationOptions):
-#
-#     pass
-#
-#
-# @register(DisplayableBlock)
-# class DisplayableBlockTranslationOptions(TranslationOptions):
-#
-#     fields = ('title', 'content', )
-#
-#
-# @register(CustomModel)
-# class CustomModelTranslationOptions(TranslationOptions):
-#
-#     pass
-#
-
-# @register(ModelImage)
-# class ModelImageTranslationOptions(TranslationOptions):
-#
-#     fields = ('description',)
-#
-#
-# @register(ModelLink)
-# class ModelLinkTranslationOptions(TranslationOptions):
-#
-#     pass
-#
-#
-# @register(ModelBlock)
-# class ModelBlockTranslationOptions(TranslationOptions):
-#
-#     fields = ('title', 'content', )
+pass
index e3c53fafb377018e55ee7d812f6e5b4cf4f5a5c0..bb1dea1864784578183579f0dc4e94ee8a8354fd 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-23 22:20
+# Generated by Django 1.9.7 on 2016-09-01 15:26
 from __future__ import unicode_literals
 
 from django.db import migrations, models
index 12f45ab686cc31b111cd679e084af1b7201dd613..3cb96013cba82236a1bcd18e2942a56ac43b6a83 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-23 22:20
+# Generated by Django 1.9.7 on 2016-09-01 15:37
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -12,10 +12,10 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('pages', '0004_auto_20160804_1547'),
         ('blog', '0001_initial'),
+        ('contenttypes', '0002_remove_content_type_name'),
         ('sites', '0002_alter_domain_unique'),
+        ('pages', '0004_auto_20160804_1547'),
     ]
 
     operations = [
@@ -26,7 +26,6 @@ class Migration(migrations.Migration):
                 ('sub_title', models.TextField(blank=True, max_length=1024, verbose_name='sub title')),
                 ('sub_title_fr', models.TextField(blank=True, max_length=1024, null=True, verbose_name='sub title')),
                 ('sub_title_en', models.TextField(blank=True, max_length=1024, null=True, verbose_name='sub title')),
-                ('related_articles', models.ManyToManyField(blank=True, related_name='_article_related_articles_+', to='organization-magazine.Article', verbose_name='Related articles')),
             ],
             options={
                 'verbose_name': 'article',
@@ -44,13 +43,13 @@ class Migration(migrations.Migration):
                 ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
                 ('file', mezzanine.core.fields.FileField(max_length=1024, verbose_name='Image')),
                 ('credits', models.CharField(blank=True, max_length=256, null=True, verbose_name='credits')),
-                ('type', models.CharField(blank=True, choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type')),
+                ('type', models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page slider')], max_length=64, verbose_name='type')),
                 ('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={
-                'ordering': ('_order',),
-                'verbose_name': 'image',
                 'verbose_name_plural': 'images',
+                'verbose_name': 'image',
+                'ordering': ('_order',),
             },
         ),
         migrations.CreateModel(
@@ -75,10 +74,8 @@ class Migration(migrations.Migration):
                 ('text_button_fr', models.CharField(blank=True, max_length=150, null=True, verbose_name='text button')),
                 ('text_button_en', models.CharField(blank=True, max_length=150, null=True, verbose_name='text button')),
                 ('external_content', models.URLField(blank=True, max_length=1000, verbose_name='external content')),
-                ('external_content_fr', models.URLField(blank=True, max_length=1000, null=True, verbose_name='external content')),
-                ('external_content_en', models.URLField(blank=True, max_length=1000, null=True, verbose_name='external content')),
                 ('object_id', models.PositiveIntegerField(editable=False, null=True, verbose_name='related object')),
-                ('content_type', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='content page')),
+                ('content_type', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='local content')),
                 ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
             ],
             options={
@@ -90,11 +87,10 @@ class Migration(migrations.Migration):
             fields=[
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='pages.Page')),
                 ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('articles', models.ManyToManyField(blank=True, to='organization-magazine.Article', verbose_name='articles')),
             ],
             options={
-                'ordering': ('_order',),
                 'verbose_name': 'topic',
+                'ordering': ('_order',),
             },
             bases=('pages.page', models.Model),
         ),
diff --git a/app/organization/magazine/migrations/0002_auto_20160824_1454.py b/app/organization/magazine/migrations/0002_auto_20160824_1454.py
deleted file mode 100644 (file)
index 8930334..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-24 12:54
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='articleimage',
-            name='type',
-            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type'),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0002_auto_20160901_1737.py b/app/organization/magazine/migrations/0002_auto_20160901_1737.py
new file mode 100644 (file)
index 0000000..e60eb5b
--- /dev/null
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-01 15:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('organization-network', '0001_initial'),
+        ('organization-magazine', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='article',
+            name='department',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='articles', to='organization-network.Department', verbose_name='department'),
+        ),
+        migrations.AddField(
+            model_name='article',
+            name='related_articles',
+            field=models.ManyToManyField(blank=True, related_name='_article_related_articles_+', to='organization-magazine.Article', verbose_name='Related articles'),
+        ),
+        migrations.AddField(
+            model_name='article',
+            name='topics',
+            field=models.ManyToManyField(blank=True, related_name='articles', to='organization-magazine.Topic', verbose_name='topics'),
+        ),
+    ]
diff --git a/app/organization/magazine/migrations/0003_auto_20160825_1232.py b/app/organization/magazine/migrations/0003_auto_20160825_1232.py
deleted file mode 100644 (file)
index b7fd372..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 10:32
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-network', '0002_auto_20160824_0020'),
-        ('organization-magazine', '0002_auto_20160824_1454'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='article',
-            name='department',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='organization-network.Department'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='articleimage',
-            name='type',
-            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page slider')], max_length=64, verbose_name='type'),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0004_auto_20160825_1259.py b/app/organization/magazine/migrations/0004_auto_20160825_1259.py
deleted file mode 100644 (file)
index 0cc78f2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 10:59
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0003_auto_20160825_1232'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='article',
-            name='department',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='department', to='organization-network.Department'),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0005_auto_20160825_1308.py b/app/organization/magazine/migrations/0005_auto_20160825_1308.py
deleted file mode 100644 (file)
index 7db2aac..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 11:08
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0004_auto_20160825_1259'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='article',
-            name='department',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='articles', to='organization-network.Department'),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0006_auto_20160825_1543.py b/app/organization/magazine/migrations/0006_auto_20160825_1543.py
deleted file mode 100644 (file)
index 49d9c23..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 13:43
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0005_auto_20160825_1308'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='topic',
-            name='articles',
-            field=models.ManyToManyField(blank=True, related_name='topics', to='organization-magazine.Article', verbose_name='articles'),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0007_auto_20160825_1614.py b/app/organization/magazine/migrations/0007_auto_20160825_1614.py
deleted file mode 100644 (file)
index 7818a0e..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 14:14
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0006_auto_20160825_1543'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='topic',
-            name='articles',
-        ),
-        migrations.AddField(
-            model_name='article',
-            name='topics',
-            field=models.ManyToManyField(blank=True, null=True, related_name='articles', to='organization-magazine.Topic', verbose_name='topics'),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0008_auto_20160825_1835.py b/app/organization/magazine/migrations/0008_auto_20160825_1835.py
deleted file mode 100644 (file)
index 9137734..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 16:35
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0007_auto_20160825_1614'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='brief',
-            name='external_content_en',
-        ),
-        migrations.RemoveField(
-            model_name='brief',
-            name='external_content_fr',
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0009_auto_20160825_1838.py b/app/organization/magazine/migrations/0009_auto_20160825_1838.py
deleted file mode 100644 (file)
index a8688d2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 16:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0008_auto_20160825_1835'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='brief',
-            name='content_type',
-            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='local content'),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0010_auto_20160825_1843.py b/app/organization/magazine/migrations/0010_auto_20160825_1843.py
deleted file mode 100644 (file)
index a72869b..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 16:43
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0009_auto_20160825_1838'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='article',
-            name='department',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='articles', to='organization-network.Department', verbose_name='department'),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0011_auto_20160826_1708.py b/app/organization/magazine/migrations/0011_auto_20160826_1708.py
deleted file mode 100644 (file)
index 4b6956a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.10 on 2016-08-26 15:08
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0010_auto_20160825_1843'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='article',
-            name='topics',
-            field=models.ManyToManyField(blank=True, related_name='articles', to='organization-magazine.Topic', verbose_name='topics'),
-        ),
-    ]
index 5094f39305b31e2558f07397f2a234f593637757..5fac81896876905c94e4def7e7c57d62618b5a84 100644 (file)
@@ -9,22 +9,11 @@ class VideoAdmin(admin.ModelAdmin):
     model = Video
 
 
-# class VideoAdminDisplayable(DisplayableAdmin):
-#
-#     fieldsets = deepcopy(VideoAdmin.fieldsets)
-#     #filter_horizontal = ['artists']
-
-
 class AudioAdmin(admin.ModelAdmin):
 
     model = Audio
 
 
-# class AudioAdminDisplayable(DisplayableAdmin):
-#
-#     fieldsets = deepcopy(AudioAdmin.fieldsets)
-#     # filter_horizontal = ['artists']
-
 
 class PlaylistAdmin(admin.ModelAdmin):
 
@@ -33,7 +22,7 @@ class PlaylistAdmin(admin.ModelAdmin):
     filter_horizontal = ['audios']
 
 
-# admin.site.register(Video, VideoAdminDisplayable)
-# admin.site.register(Audio, AudioAdminDisplayable)
+admin.site.register(Video, VideoAdmin)
+admin.site.register(Audio, AudioAdmin)
 admin.site.register(Playlist, PlaylistAdmin)
 admin.site.register(VideoCategory)
index a1983324d813d30d1f84c18297401fded40b706e..72201d84c90928db3910edf6b07ed57dfb6e30c7 100644 (file)
@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-23 22:20
+# Generated by Django 1.9.7 on 2016-09-01 15:32
 from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.db.models.deletion
-import mezzanine.core.fields
 
 
 class Migration(migrations.Migration):
@@ -20,31 +19,16 @@ class Migration(migrations.Migration):
             name='Audio',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
-                ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
-                ('_meta_title', models.CharField(blank=True, 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')),
-                ('description', models.TextField(blank=True, verbose_name='Description')),
-                ('description_fr', models.TextField(blank=True, null=True, verbose_name='Description')),
-                ('description_en', models.TextField(blank=True, null=True, verbose_name='Description')),
-                ('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(editable=False, null=True)),
-                ('updated', models.DateTimeField(editable=False, null=True)),
-                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
-                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
-                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
-                ('short_url', models.URLField(blank=True, null=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')),
+                ('title', models.CharField(max_length=1024, verbose_name='title')),
+                ('title_fr', models.CharField(max_length=1024, null=True, verbose_name='title')),
+                ('title_en', models.CharField(max_length=1024, null=True, verbose_name='title')),
+                ('description', models.TextField(blank=True, verbose_name='description')),
+                ('description_fr', models.TextField(blank=True, null=True, verbose_name='description')),
+                ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
                 ('media_id', models.CharField(max_length=128, verbose_name='media id')),
                 ('open_source_url', models.URLField(blank=True, max_length=1024, verbose_name='open source URL')),
                 ('closed_source_url', models.URLField(blank=True, max_length=1024, verbose_name='closed source URL')),
                 ('poster_url', models.URLField(blank=True, max_length=1024, verbose_name='poster')),
-                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
             ],
             options={
                 'verbose_name': 'audio',
@@ -67,26 +51,12 @@ class Migration(migrations.Migration):
             name='Video',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
-                ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
-                ('_meta_title', models.CharField(blank=True, 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')),
-                ('description', models.TextField(blank=True, verbose_name='Description')),
-                ('description_fr', models.TextField(blank=True, null=True, verbose_name='Description')),
-                ('description_en', models.TextField(blank=True, null=True, verbose_name='Description')),
-                ('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(editable=False, null=True)),
-                ('updated', models.DateTimeField(editable=False, null=True)),
-                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
-                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
-                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
-                ('short_url', models.URLField(blank=True, null=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')),
+                ('title', models.CharField(max_length=1024, verbose_name='title')),
+                ('title_fr', models.CharField(max_length=1024, null=True, verbose_name='title')),
+                ('title_en', models.CharField(max_length=1024, null=True, verbose_name='title')),
+                ('description', models.TextField(blank=True, verbose_name='description')),
+                ('description_fr', models.TextField(blank=True, null=True, verbose_name='description')),
+                ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
                 ('media_id', models.CharField(max_length=128, verbose_name='media id')),
                 ('open_source_url', models.URLField(blank=True, max_length=1024, verbose_name='open source URL')),
                 ('closed_source_url', models.URLField(blank=True, max_length=1024, verbose_name='closed source URL')),
@@ -113,9 +83,4 @@ class Migration(migrations.Migration):
             name='category',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='videos', to='organization-media.VideoCategory', verbose_name='category'),
         ),
-        migrations.AddField(
-            model_name='video',
-            name='site',
-            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site'),
-        ),
     ]
diff --git a/app/organization/media/migrations/0002_auto_20160826_1805.py b/app/organization/media/migrations/0002_auto_20160826_1805.py
deleted file mode 100644 (file)
index e396965..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.10 on 2016-08-26 16:05
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-core', '0003_auto_20160825_1232'),
-        ('organization-media', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='audio',
-            name='_meta_title',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='created',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='description',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='expiry_date',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='gen_description',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='id',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='in_sitemap',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='keywords_string',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='publish_date',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='short_url',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='site',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='slug',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='status',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='title',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='updated',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='_meta_title',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='created',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='description',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='expiry_date',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='gen_description',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='id',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='in_sitemap',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='keywords_string',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='publish_date',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='short_url',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='site',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='slug',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='status',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='title',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='updated',
-        ),
-        migrations.AddField(
-            model_name='audio',
-            name='customdisplayable_ptr',
-            field=models.OneToOneField(auto_created=True, default=1, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-core.CustomDisplayable'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='video',
-            name='customdisplayable_ptr',
-            field=models.OneToOneField(auto_created=True, default=1, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-core.CustomDisplayable'),
-            preserve_default=False,
-        ),
-    ]
diff --git a/app/organization/media/migrations/0003_auto_20160826_1806.py b/app/organization/media/migrations/0003_auto_20160826_1806.py
deleted file mode 100644 (file)
index b26a6a3..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.10 on 2016-08-26 16:06
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0004_auto_20160804_1547'),
-        ('organization-media', '0002_auto_20160826_1805'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='PageAudio',
-            fields=[
-                ('audio_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-media.Audio')),
-                ('page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='audios', to='pages.Page', verbose_name='page')),
-            ],
-            options={
-                'verbose_name_plural': 'audios',
-                'verbose_name': 'audio',
-            },
-            bases=('organization-media.audio',),
-        ),
-        migrations.CreateModel(
-            name='PageVideo',
-            fields=[
-                ('video_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-media.Video')),
-                ('page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='videos', to='pages.Page', verbose_name='page')),
-            ],
-            options={
-                'verbose_name_plural': 'videos',
-                'verbose_name': 'video',
-            },
-            bases=('organization-media.video',),
-        ),
-        migrations.AlterOrderWithRespectTo(
-            name='pagevideo',
-            order_with_respect_to='page',
-        ),
-        migrations.AlterOrderWithRespectTo(
-            name='pageaudio',
-            order_with_respect_to='page',
-        ),
-    ]
diff --git a/app/organization/media/migrations/0004_auto_20160826_1834.py b/app/organization/media/migrations/0004_auto_20160826_1834.py
deleted file mode 100644 (file)
index 8905076..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.10 on 2016-08-26 16:34
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-media', '0003_auto_20160826_1806'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='audio',
-            name='content',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='content_en',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='content_fr',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='content',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='content_en',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='content_fr',
-        ),
-    ]
diff --git a/app/organization/media/migrations/0005_displayableaudio.py b/app/organization/media/migrations/0005_displayableaudio.py
deleted file mode 100644 (file)
index f28928c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-31 13:45
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-core', '0003_auto_20160825_1232'),
-        ('organization-media', '0004_auto_20160826_1834'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='DisplayableAudio',
-            fields=[
-                ('audio_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-media.Audio')),
-                ('displayable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='audios', to='organization-core.CustomDisplayable', verbose_name='displayable')),
-            ],
-            options={
-                'verbose_name': 'audio',
-                'verbose_name_plural': 'audios',
-            },
-            bases=('organization-media.audio',),
-        ),
-    ]
diff --git a/app/organization/media/migrations/0006_auto_20160901_1555.py b/app/organization/media/migrations/0006_auto_20160901_1555.py
deleted file mode 100644 (file)
index 6034a05..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-01 13:55
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-media', '0005_displayableaudio'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='displayableaudio',
-            name='audio_ptr',
-        ),
-        migrations.RemoveField(
-            model_name='displayableaudio',
-            name='displayable',
-        ),
-        migrations.RemoveField(
-            model_name='audio',
-            name='customdisplayable_ptr',
-        ),
-        migrations.RemoveField(
-            model_name='video',
-            name='customdisplayable_ptr',
-        ),
-        migrations.AddField(
-            model_name='audio',
-            name='description',
-            field=models.TextField(blank=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='audio',
-            name='id',
-            field=models.AutoField(auto_created=True, default=1, primary_key=True, serialize=False, verbose_name='ID'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='audio',
-            name='title',
-            field=models.CharField(default='a', max_length=1024, verbose_name='title'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='video',
-            name='description',
-            field=models.TextField(blank=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='video',
-            name='id',
-            field=models.AutoField(auto_created=True, default=1, primary_key=True, serialize=False, verbose_name='ID'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='video',
-            name='title',
-            field=models.CharField(default='a', max_length=1024, verbose_name='title'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='audio',
-            name='description_en',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AlterField(
-            model_name='audio',
-            name='description_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AlterField(
-            model_name='audio',
-            name='title_en',
-            field=models.CharField(max_length=1024, null=True, verbose_name='title'),
-        ),
-        migrations.AlterField(
-            model_name='audio',
-            name='title_fr',
-            field=models.CharField(max_length=1024, null=True, verbose_name='title'),
-        ),
-        migrations.AlterField(
-            model_name='video',
-            name='description_en',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AlterField(
-            model_name='video',
-            name='description_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AlterField(
-            model_name='video',
-            name='title_en',
-            field=models.CharField(max_length=1024, null=True, verbose_name='title'),
-        ),
-        migrations.AlterField(
-            model_name='video',
-            name='title_fr',
-            field=models.CharField(max_length=1024, null=True, verbose_name='title'),
-        ),
-        migrations.DeleteModel(
-            name='DisplayableAudio',
-        ),
-    ]
index 6f3d42c45500d0504fb7572b0a5ee19ff20c556a..c7dcb68ca0229ebd9ac741dee2621383b4888ef4 100644 (file)
@@ -9,7 +9,6 @@ from mezzanine.core.models import RichText, Displayable, Slugged
 from mezzanine.core.fields import RichTextField, OrderField, FileField
 from mezzanine.utils.models import AdminThumbMixin, upload_to
 from organization.core.models import *
-from organization.pages.models import Page
 from mezzanine_agenda.models import Event
 from django.conf import settings
 import requests
@@ -67,26 +66,6 @@ class Audio(Media):
         return reverse("festival-video-detail", kwargs={"slug": self.slug})
 
 
-class PageAudio(Audio):
-
-    page = models.ForeignKey(Page, verbose_name=_('page'), related_name='audios', blank=True, null=True, on_delete=models.SET_NULL)
-
-    class Meta:
-        verbose_name = _("audio")
-        verbose_name_plural = _("audios")
-        order_with_respect_to = "page"
-
-#
-# class DisplayableAudio(Audio):
-#
-#     displayable = models.ForeignKey(Titled, verbose_name=_('displayable'), related_name='audios', blank=True, null=True, on_delete=models.SET_NULL)
-#
-#     class Meta:
-#         verbose_name = _("audio")
-#         verbose_name_plural = _("audios")
-
-
-
 class Video(Media):
     """Video"""
 
@@ -106,16 +85,6 @@ class Video(Media):
         return reverse("festival-video-detail", kwargs={"slug": self.slug})
 
 
-class PageVideo(Video):
-
-    page = models.ForeignKey(Page, verbose_name=_('page'), related_name='videos', blank=True, null=True, on_delete=models.SET_NULL)
-
-    class Meta:
-        verbose_name = _("video")
-        verbose_name_plural = _("videos")
-        order_with_respect_to = "page"
-
-
 class VideoCategory(Slugged):
     """Video Category"""
 
index d25f287cbf272956843b252fc84d039dc78560a3..cc42b392726a89547e4015b067406c179bcba562 100644 (file)
@@ -13,14 +13,3 @@ class VideoTranslationOptions(TranslationOptions):
 class AudioTranslationOptions(TranslationOptions):
 
     fields = ('title', 'description',)
-
-
-@register(PageVideo)
-class PageVideoTranslationOptions(TranslationOptions):
-
-    pass
-
-@register(PageAudio)
-class PageAudioTranslationOptions(TranslationOptions):
-
-    pass
index d736bbefda3e66fdcfe2c6bad35935bb9e9bcfaf..9675c1e4ae9744a89ab07fbf88913b27bb2a54f9 100644 (file)
@@ -7,7 +7,7 @@ from mezzanine.pages.admin import PageAdmin
 from organization.network.models import *
 from organization.pages.models import *
 from organization.core.admin import *
-from organization.media.models import PageAudio, PageVideo
+from organization.pages.models import PageAudio, PageVideo
 
 
 class PageAudioInline(StackedDynamicInlineAdmin):
@@ -45,8 +45,7 @@ class DepartmentPageImageInline(TabularDynamicInlineAdmin):
 
 class DepartmentPageAdmin(PageAdmin):
 
-    pass
-    # inlines = [DepartmentPageImageInline, DepartmentPageBlockInline, PageAudioInline, PageVideoInline, ]
+    inlines = [DepartmentPageImageInline, DepartmentPageBlockInline, PageAudioInline, PageVideoInline, ]
 
 
 class DepartmentAdmin(BaseTranslationModelAdmin):
index 1ba8811263c9c43aad8a073ea6d0b4c0c21ed03b..46345244f9a6d89ccb20a80344b2525d926b9bef 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-23 22:20
+# Generated by Django 1.9.7 on 2016-09-01 15:37
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -15,7 +15,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('pages', '0004_auto_20160804_1547'),
-        ('organization-core', '0001_initial'),
     ]
 
     operations = [
@@ -91,15 +90,15 @@ 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={
-                'ordering': ('_order',),
                 'verbose_name': 'department page',
+                'ordering': ('_order',),
             },
             bases=('pages.page', models.Model),
         ),
         migrations.CreateModel(
             name='Organization',
             fields=[
-                ('custommodel_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-core.CustomModel')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=512, verbose_name='name')),
                 ('description', models.TextField(blank=True, verbose_name='description')),
                 ('description_fr', models.TextField(blank=True, null=True, verbose_name='description')),
@@ -113,7 +112,6 @@ class Migration(migrations.Migration):
             options={
                 'verbose_name': 'organization',
             },
-            bases=('organization-core.custommodel', models.Model),
         ),
         migrations.CreateModel(
             name='OrganizationType',
@@ -129,7 +127,20 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Person',
             fields=[
-                ('customdisplayable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-core.CustomDisplayable')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
+                ('title', models.CharField(max_length=500, verbose_name='Title')),
+                ('slug', models.CharField(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
+                ('_meta_title', models.CharField(blank=True, 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')),
+                ('description', models.TextField(blank=True, verbose_name='Description')),
+                ('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(editable=False, null=True)),
+                ('updated', models.DateTimeField(editable=False, null=True)),
+                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
+                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
+                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
+                ('short_url', models.URLField(blank=True, null=True)),
+                ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
                 ('person_title', models.CharField(blank=True, choices=[('Dr', 'Dr'), ('Prof', 'Prof'), ('Prof Dr', 'Prof Dr')], max_length=16, verbose_name='title')),
                 ('gender', models.CharField(blank=True, choices=[('male', 'male'), ('female', 'female')], max_length=16, verbose_name='gender')),
                 ('first_name', models.CharField(blank=True, max_length=255, null=True, verbose_name='first name')),
@@ -141,10 +152,10 @@ class Migration(migrations.Migration):
                 ('permanent', models.BooleanField(default=False, verbose_name='permanent')),
             ],
             options={
-                'ordering': ['last_name'],
                 'verbose_name': 'person',
+                'ordering': ['last_name'],
             },
-            bases=('organization-core.customdisplayable', mezzanine.utils.models.AdminThumbMixin),
+            bases=(models.Model, mezzanine.utils.models.AdminThumbMixin),
         ),
         migrations.CreateModel(
             name='PersonActivity',
@@ -182,8 +193,8 @@ class Migration(migrations.Migration):
                 ('phd_officer_2', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='phd_officer_2_activity', to='organization-network.Person', verbose_name='PhD officer 2')),
             ],
             options={
-                'verbose_name': 'activity',
                 'verbose_name_plural': 'activities',
+                'verbose_name': 'activity',
             },
         ),
         migrations.CreateModel(
@@ -228,8 +239,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={
-                'ordering': ('_order',),
                 'verbose_name': 'team page',
+                'ordering': ('_order',),
             },
             bases=('pages.page', models.Model),
         ),
diff --git a/app/organization/network/migrations/0002_auto_20160824_0020.py b/app/organization/network/migrations/0002_auto_20160824_0020.py
deleted file mode 100644 (file)
index 96c1457..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- 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/network/migrations/0002_auto_20160901_1737.py b/app/organization/network/migrations/0002_auto_20160901_1737.py
new file mode 100644 (file)
index 0000000..ee277f4
--- /dev/null
@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-01 15:37
+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'),
+        ('sites', '0002_alter_domain_unique'),
+        ('organization-network', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    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='site',
+            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site'),
+        ),
+        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/0003_auto_20160901_1555.py b/app/organization/network/migrations/0003_auto_20160901_1555.py
deleted file mode 100644 (file)
index 8f1a12a..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-01 13:55
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sites', '0002_alter_domain_unique'),
-        ('organization-network', '0002_auto_20160824_0020'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='organization',
-            name='custommodel_ptr',
-        ),
-        migrations.RemoveField(
-            model_name='person',
-            name='customdisplayable_ptr',
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='id',
-            field=models.AutoField(auto_created=True, default=1, primary_key=True, serialize=False, verbose_name='ID'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='_meta_title',
-            field=models.CharField(blank=True, 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'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='created',
-            field=models.DateTimeField(editable=False, null=True),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='description',
-            field=models.TextField(blank=True, verbose_name='Description'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='expiry_date',
-            field=models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            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='person',
-            name='id',
-            field=models.AutoField(auto_created=True, default=1, primary_key=True, serialize=False, verbose_name='ID'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='in_sitemap',
-            field=models.BooleanField(default=True, verbose_name='Show in sitemap'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='keywords_string',
-            field=models.CharField(blank=True, editable=False, max_length=500),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='publish_date',
-            field=models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='short_url',
-            field=models.URLField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='site',
-            field=models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='slug',
-            field=models.CharField(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='status',
-            field=models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='title',
-            field=models.CharField(default='a', max_length=500, verbose_name='Title'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='updated',
-            field=models.DateTimeField(editable=False, null=True),
-        ),
-    ]
index 3c73a53f442e93fbd702c0f6745a9824e32e8d6f..6b70c05a5ffcb8e594a38816e85884d20b4298e9 100644 (file)
@@ -8,7 +8,7 @@ from mezzanine.pages.admin import PageAdmin
 from organization.pages.models import *
 from organization.pages.models import DynamicContentHomeSlider, DynamicContentHomeBody, Home
 from organization.pages.forms import DynamicContentHomeSliderForm, DynamicContentHomeBodyForm
-from organization.media.models import PageAudio, PageVideo
+
 
 class PageBlockInline(StackedDynamicInlineAdmin):
 
index 2e349aafb98be241e71ad744dbe2e3d5c6272f54..11fbd2917d4b6e98eeccafc3ace8e6f8ca5e3023 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-23 22:20
+# Generated by Django 1.9.7 on 2016-09-01 15:33
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -12,9 +12,10 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('sites', '0002_alter_domain_unique'),
         ('contenttypes', '0002_remove_content_type_name'),
         ('pages', '0004_auto_20160804_1547'),
-        ('sites', '0002_alter_domain_unique'),
+        ('organization-media', '0001_initial'),
     ]
 
     operations = [
@@ -30,8 +31,8 @@ class Migration(migrations.Migration):
                 ('sub_title_en', models.TextField(blank=True, max_length=1024, null=True, verbose_name='sub title')),
             ],
             options={
-                'ordering': ('_order',),
                 'verbose_name': 'custom page',
+                'ordering': ('_order',),
             },
             bases=('pages.page', models.Model),
         ),
@@ -44,8 +45,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={
-                'ordering': ('_order',),
                 'verbose_name': 'Dynamic Content Home Body',
+                'ordering': ('_order',),
             },
         ),
         migrations.CreateModel(
@@ -57,8 +58,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={
-                'ordering': ('_order',),
                 'verbose_name': 'Dynamic Content Home Slider',
+                'ordering': ('_order',),
             },
         ),
         migrations.CreateModel(
@@ -85,6 +86,18 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'homes',
             },
         ),
+        migrations.CreateModel(
+            name='PageAudio',
+            fields=[
+                ('audio_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-media.Audio')),
+                ('page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='audios', to='pages.Page', verbose_name='page')),
+            ],
+            options={
+                'verbose_name': 'audio',
+                'verbose_name_plural': 'audios',
+            },
+            bases=('organization-media.audio',),
+        ),
         migrations.CreateModel(
             name='PageBlock',
             fields=[
@@ -99,11 +112,11 @@ class Migration(migrations.Migration):
                 ('description', models.TextField(blank=True, verbose_name='description')),
                 ('with_separator', models.BooleanField(default=False)),
                 ('background_color', models.CharField(blank=True, choices=[('black', 'black'), ('yellow', 'yellow'), ('red', 'red')], max_length=32, verbose_name='background color')),
-                ('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')),
+                ('page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='blocks', to='pages.Page', verbose_name='page')),
             ],
             options={
-                'ordering': ('_order',),
                 'verbose_name': 'page block',
+                'ordering': ('_order',),
                 'verbose_name_plural': 'blocks',
             },
         ),
@@ -118,15 +131,27 @@ class Migration(migrations.Migration):
                 ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
                 ('file', mezzanine.core.fields.FileField(max_length=1024, verbose_name='Image')),
                 ('credits', models.CharField(blank=True, max_length=256, null=True, verbose_name='credits')),
-                ('type', models.CharField(blank=True, choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type')),
-                ('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')),
+                ('type', models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page slider')], max_length=64, verbose_name='type')),
+                ('page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='images', to='pages.Page', verbose_name='page')),
             ],
             options={
-                'ordering': ('_order',),
                 'verbose_name': 'image',
+                'ordering': ('_order',),
                 'verbose_name_plural': 'images',
             },
         ),
+        migrations.CreateModel(
+            name='PageVideo',
+            fields=[
+                ('video_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-media.Video')),
+                ('page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='videos', to='pages.Page', verbose_name='page')),
+            ],
+            options={
+                'verbose_name': 'video',
+                'verbose_name_plural': 'videos',
+            },
+            bases=('organization-media.video',),
+        ),
         migrations.AddField(
             model_name='dynamiccontenthomeslider',
             name='home',
@@ -137,4 +162,12 @@ class Migration(migrations.Migration):
             name='home',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-pages.Home', verbose_name='home'),
         ),
+        migrations.AlterOrderWithRespectTo(
+            name='pagevideo',
+            order_with_respect_to='page',
+        ),
+        migrations.AlterOrderWithRespectTo(
+            name='pageaudio',
+            order_with_respect_to='page',
+        ),
     ]
diff --git a/app/organization/pages/migrations/0002_auto_20160824_1454.py b/app/organization/pages/migrations/0002_auto_20160824_1454.py
deleted file mode 100644 (file)
index 2c02e31..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-24 12:54
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-pages', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='pageimage',
-            name='type',
-            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type'),
-        ),
-    ]
diff --git a/app/organization/pages/migrations/0003_auto_20160824_1550.py b/app/organization/pages/migrations/0003_auto_20160824_1550.py
deleted file mode 100644 (file)
index 4eac454..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-24 13:50
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-pages', '0002_auto_20160824_1454'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='pageblock',
-            name='page',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='blocks', to='pages.Page', verbose_name='page'),
-        ),
-        migrations.AlterField(
-            model_name='pageimage',
-            name='page',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='images', to='pages.Page', verbose_name='page'),
-        ),
-    ]
diff --git a/app/organization/pages/migrations/0004_auto_20160825_1232.py b/app/organization/pages/migrations/0004_auto_20160825_1232.py
deleted file mode 100644 (file)
index 1f2453b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-25 10:32
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-pages', '0003_auto_20160824_1550'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='pageimage',
-            name='type',
-            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page slider')], max_length=64, verbose_name='type'),
-        ),
-    ]
index feca4c3eed6a58bffee8b8128e971002287fdf56..dafca37408b2d4edc4edcb852494560d96638ed2 100644 (file)
@@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse, reverse_lazy
 from mezzanine.core.models import Displayable, Slugged, Orderable
 from organization.core.models import *
+from organization.media.models import *
 
 
 class CustomPage(Page, SubTitled, RichText):
@@ -31,6 +32,26 @@ class PageImage(Image):
         order_with_respect_to = "page"
 
 
+class PageAudio(Audio):
+
+    page = models.ForeignKey(Page, verbose_name=_('page'), related_name='audios', blank=True, null=True, on_delete=models.SET_NULL)
+
+    class Meta:
+        verbose_name = _("audio")
+        verbose_name_plural = _("audios")
+        order_with_respect_to = "page"
+
+
+class PageVideo(Video):
+
+    page = models.ForeignKey(Page, verbose_name=_('page'), related_name='videos', blank=True, null=True, on_delete=models.SET_NULL)
+
+    class Meta:
+        verbose_name = _("video")
+        verbose_name_plural = _("videos")
+        order_with_respect_to = "page"
+
+
 class DynamicContentHomeSlider(DynamicContent, Orderable):
 
     home = models.ForeignKey("home", verbose_name=_('home'), blank=True, null=True, on_delete=models.SET_NULL)
index 396a6d8b03c58a8ececdfc3244bead6bd68a056d..1baf9892d1624effdef8da976f83b6ba7f90fa33 100644 (file)
@@ -38,3 +38,14 @@ class PageBlockTranslationOptions(TranslationOptions):
 class PageImageTranslationOptions(TranslationOptions):
 
     fields = ('description',)
+
+
+@register(PageVideo)
+class PageVideoTranslationOptions(TranslationOptions):
+
+    pass
+
+@register(PageAudio)
+class PageAudioTranslationOptions(TranslationOptions):
+
+    pass
index afa8438b48ca7adb6d6945e6010017cbc4b1daf6..5ca80b4496afc7a31dcb70daedf97f177caecd75 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-23 22:20
+# Generated by Django 1.9.7 on 2016-09-01 15:37
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -13,18 +13,31 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('organization-network', '0001_initial'),
-        ('organization-core', '0001_initial'),
+        ('sites', '0002_alter_domain_unique'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Project',
             fields=[
-                ('customdisplayable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-core.CustomDisplayable')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
+                ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
+                ('_meta_title', models.CharField(blank=True, 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')),
+                ('description', models.TextField(blank=True, verbose_name='Description')),
                 ('description_fr', models.TextField(blank=True, null=True, verbose_name='Description')),
                 ('description_en', models.TextField(blank=True, null=True, verbose_name='Description')),
+                ('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(editable=False, null=True)),
+                ('updated', models.DateTimeField(editable=False, null=True)),
+                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
+                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
+                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
+                ('short_url', models.URLField(blank=True, null=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')),
@@ -34,11 +47,11 @@ class Migration(migrations.Migration):
                 ('lead_team', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='leader_projects', to='organization-network.Team', verbose_name='lead team')),
                 ('organizations', models.ManyToManyField(blank=True, to='organization-network.Organization', verbose_name='organizations')),
                 ('persons', models.ManyToManyField(blank=True, to='organization-network.Person', verbose_name='persons')),
+                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
                 ('teams', models.ManyToManyField(blank=True, related_name='patner_projects', to='organization-network.Team', verbose_name='teams')),
             ],
             options={
                 'verbose_name': 'project',
             },
-            bases=('organization-core.customdisplayable', models.Model),
         ),
     ]
diff --git a/app/organization/projects/migrations/0002_auto_20160901_1555.py b/app/organization/projects/migrations/0002_auto_20160901_1555.py
deleted file mode 100644 (file)
index ccd1542..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-01 13:55
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sites', '0002_alter_domain_unique'),
-        ('organization-projects', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='project',
-            name='customdisplayable_ptr',
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='_meta_title',
-            field=models.CharField(blank=True, 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'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='created',
-            field=models.DateTimeField(editable=False, null=True),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='description',
-            field=models.TextField(blank=True, verbose_name='Description'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='expiry_date',
-            field=models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            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='project',
-            name='id',
-            field=models.AutoField(auto_created=True, default=1, primary_key=True, serialize=False, verbose_name='ID'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='in_sitemap',
-            field=models.BooleanField(default=True, verbose_name='Show in sitemap'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='keywords_string',
-            field=models.CharField(blank=True, editable=False, max_length=500),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='publish_date',
-            field=models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='short_url',
-            field=models.URLField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='site',
-            field=models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='slug',
-            field=models.CharField(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='status',
-            field=models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='title',
-            field=models.CharField(default='a', max_length=500, verbose_name='Title'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='updated',
-            field=models.DateTimeField(editable=False, null=True),
-        ),
-    ]
index 6a09c9189f9153975ae36c75ef7c7f6c2689e62a..aada6c553dda07e3c0d7f8e56aef66c8c445ca78 100644 (file)
@@ -226,11 +226,11 @@ INSTALLED_APPS = [
     "mezzanine_agenda",
 #    "orderable",
     "organization.core",
+    "organization.media",
     "organization.pages",
     "organization.network",
     "organization.festival",
     "organization.magazine",
-    "organization.media",
     "organization.projects",
     "organization.agenda",
 ]