edb/neuf-www
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make a common stream field, support all block types everywhere

Browse Source
This commit is contained in:
Jonas Braathen
2024-05-20 22:42:30 +02:00
parent e88aa5e142
commit a7e83a3163
11 changed files with 117 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dnscms/associations/migrations/0009_alter_associationindex_body_and_more.py Normal file
View File

@ -0,0 +1,26 @@
# Generated by Django 5.0.6 on 2024-05-20 20:08
import wagtail.blocks
import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('associations', '0008_alter_associationpage_excerpt'),
]
operations = [
migrations.AlterField(
model_name='associationindex',
name='body',
field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(label='Rik tekst')), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(label='Bilde')), ('image_format', wagtail.blocks.ChoiceBlock(choices=[('fullwidth', 'Fullbredde'), ('bleed', 'Utfallende'), ('original', 'Uendret størrelse')], icon='cup', label='Bildeformat')), ('text', wagtail.blocks.CharBlock(label='Tekst', max_length=512, required=False))], label='Bilde')), ('image_slider', wagtail.blocks.StructBlock([('images', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(label='Bilde')), ('text', wagtail.blocks.CharBlock(label='Tekst', max_length=512, required=False))]), label='Bilder', min_num=1))], label='Bildegalleri'))], default=[('paragraph', '')]),
),
migrations.AlterField(
model_name='associationpage',
name='body',
field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(label='Rik tekst')), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(label='Bilde')), ('image_format', wagtail.blocks.ChoiceBlock(choices=[('fullwidth', 'Fullbredde'), ('bleed', 'Utfallende'), ('original', 'Uendret størrelse')], icon='cup', label='Bildeformat')), ('text', wagtail.blocks.CharBlock(label='Tekst', max_length=512, required=False))], label='Bilde')), ('image_slider', wagtail.blocks.StructBlock([('images', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(label='Bilde')), ('text', wagtail.blocks.CharBlock(label='Tekst', max_length=512, required=False))]), label='Bilder', min_num=1))], label='Bildegalleri'))], default=[('paragraph', '')]),
),
]

17
dnscms/associations/models.py
View File

@ -5,11 +5,12 @@ from grapple.models import (
GraphQLStreamfield,
GraphQLString,
)
from wagtail import blocks
from wagtail.admin.panels import FieldPanel
from wagtail.fields import RichTextField, StreamField
from wagtail.fields import RichTextField
from wagtail.models import Page
from dnscms.fields import CommonStreamField
class AssociationIndex(Page):
max_count = 1
@ -17,11 +18,7 @@ class AssociationIndex(Page):
lead = RichTextField(features=["bold", "italic", "link"])
body = StreamField(
[
("paragraph", blocks.RichTextBlock()),
]
)
body = CommonStreamField
content_panels = Page.content_panels + [
FieldPanel("lead", heading="Leder"),
@ -44,11 +41,7 @@ class AssociationPage(Page):
UTVALG = "utvalg", "Utvalg"
excerpt = models.TextField(max_length=512, blank=False)
body = StreamField(
[
("paragraph", blocks.RichTextBlock()),
]
)
body = CommonStreamField
association_type = models.CharField(
max_length=64, choices=AssociationType, default=AssociationType.FORENING
)