Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8555] update wagtail to 6.3 LTS #2868

Merged
merged 4 commits into from
Dec 19, 2024
Merged

[8555] update wagtail to 6.3 LTS #2868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8062bbf
update wagtail to 6.0
m4ra Dec 9, 2024
32a9480
update wagtail to 6.1
m4ra Dec 10, 2024
4e8b52f
update wagtail to 6.2
m4ra Dec 12, 2024
0c36d9e
update wagtail to 6.3 LTS
m4ra Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/cms/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from wagtail import blocks
from wagtail.documents.blocks import DocumentChooserBlock
from wagtail.images.blocks import ImageChooserBlock
from wagtail.images.blocks import ImageBlock


class CallToActionBlock(blocks.StructBlock):
Expand All @@ -14,7 +14,7 @@ class Meta:


class ImageCTABlock(blocks.StructBlock):
image = ImageChooserBlock(required=False)
image = ImageBlock(required=False)
body = blocks.RichTextBlock(required=False)
link = blocks.CharBlock(required=False)
link_text = blocks.CharBlock(required=False, max_length=50, label="Link Text")
Expand Down Expand Up @@ -109,7 +109,7 @@ class QuoteBlock(blocks.StructBlock):
color = blocks.ChoiceBlock(
choices=[("turquoise", "turquoise"), ("blue", "dark blue")], default=1
)
image = ImageChooserBlock()
image = ImageBlock()
quote = blocks.TextBlock()
quote_author = blocks.CharBlock(required=False)
link = blocks.URLBlock(required=False)
Expand Down
20 changes: 20 additions & 0 deletions apps/cms/images/migrations/0005_customimage_description.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 4.2.17 on 2024-12-12 12:35

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("a4_candy_cms_images", "0004_alter_customrendition_file"),
]

operations = [
migrations.AddField(
model_name="customimage",
name="description",
field=models.CharField(
blank=True, default="", max_length=255, verbose_name="description"
),
),
]
2 changes: 0 additions & 2 deletions apps/cms/news/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,11 @@ class NewsPage(Page):

body_streamfield_de = fields.StreamField(
[("paragraph", blocks.RichTextBlock()), ("html", blocks.RawHTMLBlock())],
use_json_field=True,
blank=True,
)

body_streamfield_en = fields.StreamField(
[("paragraph", blocks.RichTextBlock()), ("html", blocks.RawHTMLBlock())],
use_json_field=True,
blank=True,
)

Expand Down
Loading