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

🤖 Update dependencies #216

Merged
merged 3 commits into from
Nov 15, 2024
Merged

🤖 Update dependencies #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42feea3
🤖 Update dependencies
github-actions[bot] Nov 13, 2024
3ff5f83
re-un-overwrites migration files
mrharpo Nov 15, 2024
8096028
re-re-Fixes s3 storages config
mrharpo Nov 15, 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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ repos:
hooks:
- id: ggshield
language_version: python3
stages: [commit]
stages: [pre-commit]
205 changes: 205 additions & 0 deletions exhibits/migrations/0015_alter_exhibitpage_body.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
# Generated by Django 5.1.3 on 2024-11-06 18:48

import wagtail.fields
from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("exhibits", "0014_alter_exhibitpage_body"),
]

operations = [
migrations.AlterField(
model_name="exhibitpage",
name="body",
field=wagtail.fields.StreamField(
[
("interviews", 8),
("archival_footage", 9),
("photographs", 10),
("original_footage", 11),
("programs", 12),
("related_content", 13),
("credits", 14),
("heading", 15),
("text", 16),
("image", 17),
("subheading", 15),
("html", 18),
],
block_lookup={
0: (
"wagtail.blocks.TextBlock",
(),
{
"help_text": "AAPB record IDs, separated by whitespace",
"required": True,
},
),
1: (
"wagtail.blocks.TextBlock",
(),
{"help_text": "Special collections IDs", "required": False},
),
2: (
"wagtail.blocks.BooleanBlock",
(),
{
"default": True,
"help_text": "Show asset title(s) for this block",
"required": False,
},
),
3: (
"wagtail.blocks.BooleanBlock",
(),
{
"default": True,
"help_text": "Show asset thumbnail(s) for this block",
"required": False,
},
),
4: (
"wagtail.blocks.BooleanBlock",
(),
{
"default": True,
"help_text": "Include title in sidebar",
"required": False,
},
),
5: (
"wagtail.blocks.RichTextBlock",
(),
{
"features": ["italic"],
"help_text": "The title of this group",
"max_length": 1024,
"required": False,
},
),
6: (
"ov_collections.blocks.DurationBlock",
(),
{"help_text": "Start time for the group", "required": False},
),
7: (
"ov_collections.blocks.DurationBlock",
(),
{"help_text": "End time for the group", "required": False},
),
8: (
"wagtail.blocks.StructBlock",
[
[
("guids", 0),
("special_collections", 1),
("show_title", 2),
("show_thumbnail", 3),
("show_sidebar", 4),
("title", 5),
("start_time", 6),
("end_time", 7),
]
],
{"icon": "openquote", "label": "Interviews"},
),
9: (
"wagtail.blocks.StructBlock",
[
[
("guids", 0),
("special_collections", 1),
("show_title", 2),
("show_thumbnail", 3),
("show_sidebar", 4),
("title", 5),
("start_time", 6),
("end_time", 7),
]
],
{"icon": "clipboard-list", "label": "Archival Footage"},
),
10: (
"wagtail.blocks.StructBlock",
[
[
("guids", 0),
("special_collections", 1),
("show_title", 2),
("show_thumbnail", 3),
("show_sidebar", 4),
("title", 5),
("start_time", 6),
("end_time", 7),
]
],
{"icon": "copy", "label": "Photographs"},
),
11: (
"wagtail.blocks.StructBlock",
[
[
("guids", 0),
("special_collections", 1),
("show_title", 2),
("show_thumbnail", 3),
("show_sidebar", 4),
("title", 5),
("start_time", 6),
("end_time", 7),
]
],
{"icon": "doc-full-inverse", "label": "Original Footage"},
),
12: (
"wagtail.blocks.StructBlock",
[
[
("guids", 0),
("special_collections", 1),
("show_title", 2),
("show_thumbnail", 3),
("show_sidebar", 4),
("title", 5),
("start_time", 6),
("end_time", 7),
]
],
{"icon": "desktop", "label": "Programs"},
),
13: (
"wagtail.blocks.StructBlock",
[
[
("guids", 0),
("special_collections", 1),
("show_title", 2),
("show_thumbnail", 3),
("show_sidebar", 4),
("title", 5),
("start_time", 6),
("end_time", 7),
]
],
{"icon": "table", "label": "Related Content"},
),
14: ("wagtail.blocks.RichTextBlock", (), {"icon": "form"}),
15: (
"wagtail.blocks.RichTextBlock",
(),
{
"features": ["italic"],
"form_classname": "title",
"icon": "title",
},
),
16: ("exhibits.models.RichTextFootnotesBlock", (), {}),
17: ("wagtail.images.blocks.ImageBlock", [], {}),
18: ("wagtail.blocks.RawHTMLBlock", (), {"label": "HTML"}),
},
),
),
]
4 changes: 2 additions & 2 deletions exhibits/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from wagtail.blocks import RawHTMLBlock, RichTextBlock
from wagtail.fields import StreamField
from wagtail.images.api.fields import ImageRenditionField
from wagtail.images.blocks import ImageChooserBlock
from wagtail.images.blocks import ImageBlock
from wagtail.models import Orderable, Page
from wagtail.search import index
from wagtail_footnotes.blocks import RichTextBlockWithFootnotes
Expand Down Expand Up @@ -154,7 +154,7 @@ class ExhibitPage(HeadlessMixin, Page):
),
),
('text', RichTextFootnotesBlock()),
('image', ImageChooserBlock()),
('image', ImageBlock()),
(
'heading',
RichTextBlock(
Expand Down
8 changes: 4 additions & 4 deletions ov_collections/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
TextBlock,
URLBlock,
)
from wagtail.images.blocks import ImageChooserBlock
from wagtail.images.blocks import ImageBlock


class DurationBlock(FieldBlock):
Expand Down Expand Up @@ -47,7 +47,7 @@ class Meta:
class ContentBlock(StructBlock):
"""Generic External link block
)
from wagtail.images.blocks import ImageChooserBlock
from wagtail.images.blocks import ImageBlock
title: RichTextBlock with italics only
link: URLBlock

Expand All @@ -66,10 +66,10 @@ class ContentImageBlock(ContentBlock):
"""Generic external link block with image

Attributes:
image: ImageChooserBlock. Required.
image: ImageBlock. Required.
"""

image = ImageChooserBlock(required=True)
image = ImageBlock(required=True)

def get_api_representation(self, value, context=None):
results = super().get_api_representation(value, context)
Expand Down
Loading