ungleich-public/public-health-ch
6
1
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

Reverted migrations

Browse source
This commit is contained in:
Oleg Lavrovsky 2017-02-23 09:23:18 +01:00
parent 9d4196657d
commit d04691c1ec
6 changed files with 27 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
publichealth/home/migrations/0003_auto_20161209_0655.py
View file

@ -1,33 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2016-12-09 05:55
from __future__ import unicode_literals
from django.db import migrations, models
import wagtail.wagtailcore.blocks
import wagtail.wagtailcore.fields
import wagtail.wagtailimages.blocks
class Migration(migrations.Migration):
dependencies = [
('home', '0002_create_homepage'),
]
operations = [
migrations.AddField(
model_name='homepage',
name='body_de',
field=wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())), blank=True, null=True),
),
migrations.AddField(
model_name='homepage',
name='body_fr',
field=wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())), blank=True, null=True),
),
migrations.AddField(
model_name='homepage',
name='title_fr',
field=models.CharField(default='', max_length=255),
),
]

30
publichealth/home/migrations/0004_auto_20170221_1728.py → publichealth/home/migrations/0003_auto_20170223_0922.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-02-21 16:28 # Generated by Django 1.10.5 on 2017-02-23 08:22
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
@ -13,9 +13,9 @@ import wagtail.wagtailimages.blocks
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('wagtailimages', '0016_deprecate_rendition_filter_relation'),
('wagtailcore', '0032_add_bulk_delete_page_permission'), ('wagtailcore', '0032_add_bulk_delete_page_permission'),
('home', '0003_auto_20161209_0655'), ('wagtailimages', '0018_remove_rendition_filter'),
('home', '0002_create_homepage'),
] ]
operations = [ operations = [
@ -36,8 +36,10 @@ class Migration(migrations.Migration):
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
('title_fr', models.CharField(default='', max_length=255)), ('title_fr', models.CharField(default='', max_length=255)),
('date', models.DateField(verbose_name='Date')), ('date', models.DateField(verbose_name='Date')),
('body_de', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())), blank=True, null=True)), ('intro_de', wagtail.wagtailcore.fields.RichTextField(default='')),
('body_fr', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())), blank=True, null=True)), ('intro_fr', wagtail.wagtailcore.fields.RichTextField(default='')),
('body_de', wagtail.wagtailcore.fields.StreamField([('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())], blank=True, null=True)),
('body_fr', wagtail.wagtailcore.fields.StreamField([('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())], blank=True, null=True)),
('feed_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ('feed_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')),
], ],
options={ options={
@ -55,21 +57,29 @@ class Migration(migrations.Migration):
('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='related_links', to='home.ArticlePage')), ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='related_links', to='home.ArticlePage')),
], ],
options={ options={
'abstract': False,
'ordering': ['sort_order'], 'ordering': ['sort_order'],
'abstract': False,
}, },
), ),
migrations.RemoveField( migrations.AddField(
model_name='homepage', model_name='homepage',
name='body_de', name='body_de',
field=wagtail.wagtailcore.fields.RichTextField(default=''),
), ),
migrations.RemoveField( migrations.AddField(
model_name='homepage', model_name='homepage',
name='body_fr', name='body_fr',
field=wagtail.wagtailcore.fields.RichTextField(default=''),
), ),
migrations.RemoveField( migrations.AddField(
model_name='homepage', model_name='homepage',
name='title_fr', name='infos_de',
field=wagtail.wagtailcore.fields.StreamField([('info', wagtail.wagtailcore.blocks.StructBlock([(b'title', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), (b'summary', wagtail.wagtailcore.blocks.RichTextBlock()), (b'action', wagtail.wagtailcore.blocks.CharBlock(required=True))]))], blank=True, null=True),
),
migrations.AddField(
model_name='homepage',
name='infos_fr',
field=wagtail.wagtailcore.fields.StreamField([('info', wagtail.wagtailcore.blocks.StructBlock([(b'title', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), (b'summary', wagtail.wagtailcore.blocks.RichTextBlock()), (b'action', wagtail.wagtailcore.blocks.CharBlock(required=True))]))], blank=True, null=True),
), ),
migrations.AddField( migrations.AddField(
model_name='homepage', model_name='homepage',

38
publichealth/home/migrations/0005_auto_20170221_1748.py
View file

@ -1,38 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-02-21 16:48
from __future__ import unicode_literals
from django.db import migrations
import wagtail.wagtailcore.blocks
import wagtail.wagtailcore.fields
import wagtail.wagtailimages.blocks
class Migration(migrations.Migration):
dependencies = [
('home', '0004_auto_20170221_1728'),
]
operations = [
migrations.AddField(
model_name='homepage',
name='body_de',
field=wagtail.wagtailcore.fields.RichTextField(default=''),
),
migrations.AddField(
model_name='homepage',
name='body_fr',
field=wagtail.wagtailcore.fields.RichTextField(default=''),
),
migrations.AddField(
model_name='homepage',
name='infos_de',
field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('summary', wagtail.wagtailcore.blocks.RichTextBlock())))),), blank=True, null=True),
),
migrations.AddField(
model_name='homepage',
name='infos_fr',
field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('summary', wagtail.wagtailcore.blocks.RichTextBlock())))),), blank=True, null=True),
),
]

28
publichealth/home/migrations/0006_auto_20170221_1811.py
View file

@ -1,28 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-02-21 17:11
from __future__ import unicode_literals
from django.db import migrations
import wagtail.wagtailcore.blocks
import wagtail.wagtailcore.fields
import wagtail.wagtailimages.blocks
class Migration(migrations.Migration):
dependencies = [
('home', '0005_auto_20170221_1748'),
]
operations = [
migrations.AlterField(
model_name='homepage',
name='infos_de',
field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('summary', wagtail.wagtailcore.blocks.RichTextBlock()), ('action', wagtail.wagtailcore.blocks.CharBlock(required=True))))),), blank=True, null=True),
),
migrations.AlterField(
model_name='homepage',
name='infos_fr',
field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('summary', wagtail.wagtailcore.blocks.RichTextBlock()), ('action', wagtail.wagtailcore.blocks.CharBlock(required=True))))),), blank=True, null=True),
),
]

8
publichealth/home/models.py
View file

@ -37,6 +37,13 @@ class ArticlePage(Page):
date = models.DateField("Date") date = models.DateField("Date")
intro_de = RichTextField(default='')
intro_fr = RichTextField(default='')
intro = TranslatedField(
'intro_de',
'intro_fr',
)
body_de = StreamField([ body_de = StreamField([
('heading', blocks.CharBlock(classname="full title")), ('heading', blocks.CharBlock(classname="full title")),
('paragraph', blocks.RichTextBlock()), ('paragraph', blocks.RichTextBlock()),
@ -80,7 +87,6 @@ class ArticlePage(Page):
] ]
parent_page_types = ['home.ArticleIndexPage'] parent_page_types = ['home.ArticleIndexPage']
subpage_types = [] subpage_types = []
template = 'article/article_page.html'
class ArticleRelatedLink(Orderable): class ArticleRelatedLink(Orderable):
page = ParentalKey(ArticlePage, related_name='related_links') page = ParentalKey(ArticlePage, related_name='related_links')

0
publichealth/home/templates/article/article_page.html → publichealth/home/templates/home/article_page.html
View file