From a8e4e91fff6297dac527d6a076071ad46ab8ec94 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 3 Mar 2020 12:22:39 +0100 Subject: [PATCH 1/2] news: Add sidebar content to news item --- mpicms/news/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpicms/news/models.py b/mpicms/news/models.py index a5b80e4..92747ba 100644 --- a/mpicms/news/models.py +++ b/mpicms/news/models.py @@ -11,7 +11,7 @@ from wagtail.admin.edit_handlers import FieldPanel from mpicms.base.models import CategoryMixin -from mpicms.base.mixins import BasePage, BodyMixin +from mpicms.base.mixins import BasePage, BodyMixin, SideBarMixin class NewsPage(CategoryMixin, BasePage): @@ -59,7 +59,7 @@ class Meta: # noqa verbose_name_plural = _("news blogs") -class NewsEntry(CategoryMixin, BodyMixin, BasePage): +class NewsEntry(CategoryMixin, SideBarMixin, BodyMixin, BasePage): date = models.DateField(_("date"), default=date.today) header_image = models.ForeignKey( 'wagtailimages.Image', @@ -75,7 +75,7 @@ class NewsEntry(CategoryMixin, BodyMixin, BasePage): content_panels = Page.content_panels + BodyMixin.content_panels + [ FieldPanel('date'), ImageChooserPanel('header_image'), - ] + ] + SideBarMixin.content_panels promote_panels = Page.promote_panels + BodyMixin.promote_panels + [ FieldPanel('show_in_main_news') From 29e1d37df877c6c1eec6b0767b2751b74bb77c97 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 3 Mar 2020 12:23:28 +0100 Subject: [PATCH 2/2] news: Add mingration for sidebar content Create migration by ./manage.py makemigrations --- .../news/migrations/0022_newsentry_sidebar.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 mpicms/news/migrations/0022_newsentry_sidebar.py diff --git a/mpicms/news/migrations/0022_newsentry_sidebar.py b/mpicms/news/migrations/0022_newsentry_sidebar.py new file mode 100644 index 0000000..6c38e1f --- /dev/null +++ b/mpicms/news/migrations/0022_newsentry_sidebar.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.9 on 2020-03-03 11:10 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.snippets.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('news', '0021_auto_20200119_1857'), + ] + + operations = [ + migrations.AddField( + model_name='newsentry', + name='sidebar', + field=wagtail.core.fields.StreamField([('editor', wagtail.core.blocks.RichTextBlock(features=['h4', 'h5', 'h6', 'bold', 'italic', 'link', 'document-link'], label='Editor')), ('contacts', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('contact', wagtail.snippets.blocks.SnippetChooserBlock('personal.Contact', label='Contact')), ('information', wagtail.core.blocks.TextBlock(label='Information', required=False))]), icon='user', label='Contacts', template='base/blocks/contact_list_block.html'))], blank=True, verbose_name='Sidebar Content'), + ), + ]