make a common stream field, support all block types everywhere

dnscms/generic/migrations/0005_alter_genericpage_body.py

@@ -0,0 +1,21 @@
+# 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 = [
+        ('generic', '0004_alter_genericpage_body'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='genericpage',
+            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', '')]),
+        ),
+    ]

dnscms/generic/models.py

@@ -1,23 +1,15 @@
 from grapple.models import GraphQLStreamfield
-from wagtail import blocks
 from wagtail.admin.panels import FieldPanel
-from wagtail.fields import StreamField
 from wagtail.models import Page
 
-from dnscms.blocks import ImageSliderBlock, ImageWithTextBlock
+from dnscms.fields import CommonStreamField
 
 
 class GenericPage(Page):
     subpage_types = ["generic.GenericPage"]
     show_in_menus = True
 
-    body = StreamField(
-        [
-            ("paragraph", blocks.RichTextBlock(label="Rik tekst")),
-            ("image", ImageWithTextBlock(label="Bilde")),
-            ("image_slider", ImageSliderBlock(label="Bildegalleri")),
-        ]
-    )
+    body = CommonStreamField
 
     content_panels = Page.content_panels + [
         FieldPanel("body", heading="Innhold"),